Chromium Code Reviews| Index: chrome/browser/resources/print_preview/print_preview.js |
| diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js |
| index 47c455d1bbe3752074401d25d87bb44b1681269b..73541ba251463e75865479cd8853746aa7005577 100644 |
| --- a/chrome/browser/resources/print_preview/print_preview.js |
| +++ b/chrome/browser/resources/print_preview/print_preview.js |
| @@ -51,6 +51,9 @@ var copiesSettings; |
| // Object holding all the layout related settings. |
| var layoutSettings; |
| +// Object holding all the header footer related settings. |
| +var headerFooterSettings; |
| + |
| // Object holding all the color related settings. |
| var colorSettings; |
| @@ -99,10 +102,12 @@ function onLoad() { |
| pageSettings = print_preview.PageSettings.getInstance(); |
| copiesSettings = print_preview.CopiesSettings.getInstance(); |
| layoutSettings = print_preview.LayoutSettings.getInstance(); |
| + headerFooterSettings = print_preview.HeaderFooterSettings.getInstance(); |
| colorSettings = print_preview.ColorSettings.getInstance(); |
| printHeader.addEventListeners(); |
| pageSettings.addEventListeners(); |
| copiesSettings.addEventListeners(); |
| + headerFooterSettings.addEventListeners(); |
| layoutSettings.addEventListeners(); |
| colorSettings.addEventListeners(); |
| @@ -311,6 +316,7 @@ function getSettings() { |
| 'landscape': layoutSettings.isLandscape(), |
| 'color': colorSettings.isColor(), |
| 'printToPDF': printToPDF, |
| + 'headerFooterEnabled': headerFooterSettings.hasHeaderFooter(), |
| 'requestID': 0}; |
| var printerList = $('printer-list'); |
| @@ -891,6 +897,10 @@ function checkIfSettingsChangedAndRegeneratePreview() { |
| setDefaultValuesAndRegeneratePreview(); |
| return true; |
| } |
| + if (printSettings.hasHeaderFooter != tempPrintSettings.hasHeaderFooter) { |
| + requestPrintPreview(); |
| + return true; |
| + } |
| if (pageSettings.requestPrintPreviewIfNeeded()) |
| return true; |
| @@ -956,6 +966,7 @@ function setDefaultValuesAndRegeneratePreview() { |
| function PrintSettings() { |
| this.deviceName = ''; |
| this.isLandscape = ''; |
| + this.hasHeaderFooter = ''; |
|
James Hawkins
2011/08/15 19:39:35
This is a boolean var, is it not?
Aayush Kumar
2011/08/15 21:37:37
Rebased and this section has now disappeared :)
|
| } |
| /** |
| @@ -964,6 +975,7 @@ function PrintSettings() { |
| PrintSettings.prototype.save = function() { |
| this.deviceName = getSelectedPrinterName(); |
| this.isLandscape = layoutSettings.isLandscape(); |
| + this.hasHeaderFooter = headerFooterSettings.hasHeaderFooter(); |
| } |
| /// Pull in all other scripts in a single shot. |
| @@ -973,5 +985,6 @@ PrintSettings.prototype.save = function() { |
| <include src="print_header.js"/> |
| <include src="page_settings.js"/> |
| <include src="copies_settings.js"/> |
| +<include src="header_footer_settings.js"/> |
| <include src="layout_settings.js"/> |
| <include src="color_settings.js"/> |