Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2472)

Unified Diff: chrome/browser/resources/print_preview.js

Issue 6883032: Print Preview: Do not show an invalid summary on load and remove the "no printers" UI code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/webui/print_preview_ui_html_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/print_preview.js
===================================================================
--- chrome/browser/resources/print_preview.js (revision 81973)
+++ chrome/browser/resources/print_preview.js (working copy)
@@ -14,8 +14,6 @@
function load() {
initializeAnimation();
- updateSummary();
-
$('printer-list').disabled = true;
$('print-button').disabled = true;
$('print-button').addEventListener('click', printFile);
@@ -122,7 +120,7 @@
return;
}
- for (var i = 0; i < pageRanges.length; i++) {
+ for (var i = 0; i < pageRanges.length; ++i) {
Lei Zhang 2011/04/19 01:29:17 There's no rule for this in JS, but I'd like to do
if (pageRanges[i].from == pageRanges[i].to)
parsedPageRanges += pageRanges[i].from;
else
@@ -229,25 +227,20 @@
* @param {number} defaultPrinterIndex The index of the default printer.
*/
function setPrinters(printers, defaultPrinterIndex) {
- if (printers.length > 0) {
- for (var i = 0; i < printers.length; ++i) {
- var option = document.createElement('option');
- option.textContent = printers[i];
- $('printer-list').add(option);
- if (i == defaultPrinterIndex)
- option.selected = true;
- }
- } else {
+ var printerList = $('printer-list');
+ for (var i = 0; i < printers.length; ++i) {
var option = document.createElement('option');
dpapad 2011/04/19 01:50:36 Removing the "No printer found" is ok with me, sin
- option.textContent = localStrings.getString('noPrinter');
- $('printer-list').add(option);
+ option.textContent = printers[i];
+ printerList.add(option);
+ if (i == defaultPrinterIndex)
+ option.selected = true;
}
// Adding option for saving PDF to disk.
var option = document.createElement('option');
option.textContent = localStrings.getString('printToPDF');
- $('printer-list').add(option);
- $('printer-list').disabled = false;
+ printerList.add(option);
+ printerList.disabled = false;
// Once the printer list is populated, generate the initial preview.
getPreview();
@@ -462,7 +455,7 @@
var pageList = [];
var parts = pageText.split(/,/);
- for (var i = 0; i < parts.length; i++) {
+ for (var i = 0; i < parts.length; ++i) {
var part = parts[i];
var match = part.match(/([0-9]+)-([0-9]+)/);
@@ -471,7 +464,7 @@
var to = parseInt(match[2], 10);
if (from && to) {
- for (var j = from; j <= to; j++)
+ for (var j = from; j <= to; ++j)
if (j <= expectedPageCount)
pageList.push(j);
}
@@ -493,10 +486,10 @@
function getPageRanges() {
var pageList = getPageList();
var pageRanges = [];
- for (var i = 0; i < pageList.length; i++) {
+ for (var i = 0; i < pageList.length; ++i) {
tempFrom = pageList[i];
while (i + 1 < pageList.length && pageList[i + 1] == pageList[i] + 1)
- i++;
+ ++i;
tempTo = pageList[i];
pageRanges.push({'from': tempFrom, 'to': tempTo});
}
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/webui/print_preview_ui_html_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698