From 6a7fdfd56a9b569a27c4e6937d26f058ea94cb63 Mon Sep 17 00:00:00 2001
From: "vandebo@chromium.org"
 <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 13 Oct 2011 09:05:42 +0000
Subject: More options for the types of margins to add.

Original (broken) CL: http://codereview.chromium.org/8227034
Already approved by dpapad@

TBR=dpapad@chromium.org
BUG=NONE
TEST=NONE


Review URL: http://codereview.chromium.org/8261005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105281 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/resources/print_preview/margin_settings.js | 14 +++++++-------
 chrome/browser/resources/print_preview/print_preview.js   |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'chrome/browser/resources/print_preview')

diff --git a/chrome/browser/resources/print_preview/margin_settings.js b/chrome/browser/resources/print_preview/margin_settings.js
index 5f48ed7..1e30663 100644
--- a/chrome/browser/resources/print_preview/margin_settings.js
+++ b/chrome/browser/resources/print_preview/margin_settings.js
@@ -172,24 +172,24 @@ cr.define('print_preview', function() {
 
     /**
      * @return {number} The value of the selected margin option.
-     * @private
      */
-    get selectedMarginsValue_() {
-      return this.marginList_.options[this.marginList_.selectedIndex].value;
+    get selectedMarginsValue() {
+      var val = this.marginList_.options[this.marginList_.selectedIndex].value;
+      return parseInt(val, 10);
     },
 
     /**
      * @return {boolean} True if default margins are selected.
      */
     isDefaultMarginsSelected: function() {
-      return this.selectedMarginsValue_ == MarginSettings.MARGINS_VALUE_DEFAULT;
+      return this.selectedMarginsValue == MarginSettings.MARGINS_VALUE_DEFAULT;
     },
 
     /**
      * @return {boolean} True if no margins are selected.
      */
     isNoMarginsSelected: function() {
-      return this.selectedMarginsValue_ ==
+      return this.selectedMarginsValue ==
           MarginSettings.MARGINS_VALUE_NO_MARGINS;
     },
 
@@ -197,7 +197,7 @@ cr.define('print_preview', function() {
      * @return {boolean} True if custom margins are selected.
      */
     isCustomMarginsSelected: function() {
-      return this.selectedMarginsValue_ == MarginSettings.MARGINS_VALUE_CUSTOM;
+      return this.selectedMarginsValue == MarginSettings.MARGINS_VALUE_CUSTOM;
     },
 
     /**
@@ -360,7 +360,7 @@ cr.define('print_preview', function() {
       else if (this.isCustomMarginsSelected())
         this.onCustomMarginsSelected_();
 
-      this.lastSelectedOption_ = this.selectedMarginsValue_;
+      this.lastSelectedOption_ = this.selectedMarginsValue;
     },
 
     /**
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index 13fde31d..5378744 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -355,11 +355,13 @@ function getSettings() {
        'printWithCloudPrint': printWithCloudPrint,
        'isFirstRequest' : false,
        'headerFooterEnabled': headerFooterSettings.hasHeaderFooter(),
-       'defaultMarginsSelected': marginSettings.isDefaultMarginsSelected(),
-       'margins': marginSettings.customMargins,
+       'marginsType': marginSettings.selectedMarginsValue,
        'requestID': -1,
        'generateDraftData': generateDraftData};
 
+  if (marginSettings.isCustomMarginsSelected())
+    settings['marginsCustom'] = marginSettings.customMargins;
+
   var printerList = $('printer-list');
   var selectedPrinter = printerList.selectedIndex;
   if (cloudprint.isCloudPrint(printerList.options[selectedPrinter])) {
-- 
cgit v1.1