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}); |
} |