diff options
author | rltoscano@google.com <rltoscano@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 02:02:28 +0000 |
---|---|---|
committer | rltoscano@google.com <rltoscano@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 02:02:28 +0000 |
commit | 2e41a5fe453cb43124e413b4e99adf761816ebd2 (patch) | |
tree | ac93e918b9f2e6f695e8a4e1d3bb9cb2f1a78c0d | |
parent | d9ee5a9894ffbb8cfa82b46827e2a678b21ac4dd (diff) | |
download | chromium_src-2e41a5fe453cb43124e413b4e99adf761816ebd2.zip chromium_src-2e41a5fe453cb43124e413b4e99adf761816ebd2.tar.gz chromium_src-2e41a5fe453cb43124e413b4e99adf761816ebd2.tar.bz2 |
Fix duplex defaults.
BUG=138312
Review URL: https://chromiumcodereview.appspot.com/10829229
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150482 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/resources/print_preview/data/local_parsers.js | 4 | ||||
-rw-r--r-- | chrome/browser/resources/print_preview/data/print_ticket_store.js | 3 | ||||
-rw-r--r-- | chrome/test/data/webui/print_preview.js | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/resources/print_preview/data/local_parsers.js b/chrome/browser/resources/print_preview/data/local_parsers.js index 03a8b83..d567b64 100644 --- a/chrome/browser/resources/print_preview/data/local_parsers.js +++ b/chrome/browser/resources/print_preview/data/local_parsers.js @@ -49,9 +49,7 @@ cr.define('print_preview', function() { if (hasDuplexCapability = settingsInfo['printerDefaultDuplexValue'] != print_preview.NativeLayer.DuplexMode.UNKNOWN_DUPLEX_MODE) { - defaultIsDuplexEnabled = - settingsInfo['printerDefaultDuplexValue'] == - print_preview.NativeLayer.DuplexMode.LONG_EDGE; + defaultIsDuplexEnabled = settingsInfo['setDuplexAsDefault'] || false; } return new print_preview.ChromiumCapabilities( diff --git a/chrome/browser/resources/print_preview/data/print_ticket_store.js b/chrome/browser/resources/print_preview/data/print_ticket_store.js index b9e2e4a..1348a8d 100644 --- a/chrome/browser/resources/print_preview/data/print_ticket_store.js +++ b/chrome/browser/resources/print_preview/data/print_ticket_store.js @@ -634,7 +634,10 @@ cr.define('print_preview', function() { if (isFirstUpdate) { cr.dispatchSimpleEvent(this, PrintTicketStore.EventType.INITIALIZE); } else { + // Reset user selection for certain ticket items. + this.duplex_.updateValue(null); this.customMargins_.updateValue(null); + if (this.marginsType_.getValue() == print_preview.ticket_items.MarginsType.Value.CUSTOM) { this.marginsType_.updateValue( diff --git a/chrome/test/data/webui/print_preview.js b/chrome/test/data/webui/print_preview.js index 5253866..38abab2 100644 --- a/chrome/test/data/webui/print_preview.js +++ b/chrome/test/data/webui/print_preview.js @@ -648,7 +648,8 @@ TEST_F('PrintPreviewWebUITest', 'TestDuplexSettings', function() { 'setColorAsDefault': true, 'disableCopiesOption': false, 'disableLandscapeOption': true, - 'printerDefaultDuplexValue': 0 + 'printerDefaultDuplexValue': 0, + 'setDuplexAsDefault': false }; this.nativeLayer_.dispatchEvent(capsSetEvent); @@ -681,7 +682,8 @@ TEST_F('PrintPreviewWebUITest', 'TestDuplexSettings', function() { 'setColorAsDefault': false, 'disableCopiesOption': false, 'disableLandscapeOption': false, - 'printerDefaultDuplexValue': 1 + 'printerDefaultDuplexValue': 1, + 'setDuplexAsDefault': true }; this.nativeLayer_.dispatchEvent(capsSetEvent); |