Print Preview: Making margin selection sticky (part 2/2)

chrome/browser/resources/print_preview/margin_settings.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('print_preview', function() {
   'use strict';
 
   /**
    * Creates a Margins object that holds four margin values. The units in which
    * the values are expressed can be any numeric value.
@@ skipping 111 matching lines @@
     this.marginsUI_ = null;
 
     // Holds the custom margin values in points (if set).
     this.customMargins_ = new Margins(-1, -1, -1, -1);
     // Holds the previous custom margin values in points.
     this.previousCustomMargins_ = new Margins(-1, -1, -1, -1);
     // Holds the width of the page in points.
     this.pageWidth_ = -1;
     // Holds the height of the page in points.
     this.pageHeight_ = -1;
-    // The last selected margin option.
-    this.lastSelectedOption_ = MarginSettings.MARGINS_VALUE_DEFAULT;
-
+    // @type {boolean} True if the margins UI should be diplayed when the next

[kmadhusu, 2011/11/03 17:35:38]

As per the comments, Margins options will not be shown until the pdf load event
is fired. I think you meant to set the custom margins on PDF Load event. 

forceMarginsUIOnPDFLoad_ => forceCustomMarginsOnPDFLoad_? or something similar.
"forceMarginsUI" seems vague to me.

+    //     |customEvents.PDF_LOADED| event occurs.
+    this.forceMarginsUIOnPDFLoad_ = false;
     // Holds the currently updated default page layout values.
     this.currentDefaultPageLayout = null;
     // Holds the default page layout values when the custom margins was last
     // selected.
     this.previousDefaultPageLayout_ = null;
 
     // True if the margins UI should be shown regardless of mouse position.
     this.forceDisplayingMarginLines_ = true;
 
     // @type {EventTracker} Used to keep track of certain event listeners.
@@ skipping 51 matching lines @@
     get customMargins() {
       var margins = {};
       margins.marginLeft = this.customMargins_.left;
       margins.marginTop = this.customMargins_.top;
       margins.marginRight = this.customMargins_.right;
       margins.marginBottom = this.customMargins_.bottom;
       return margins;
     },
 
     /**
+     * Sets |this.customMargins_| according to |margins|.
+     * @param {{marginLeft: number, marginTop: number, marginRight: bottom,
+     *     marginRight: number}} margins An object holding the four margin
+     *     values.
+     */
+    set customMargins(margins) {
+      this.customMargins_.left = margins.marginLeft;
+      this.customMargins_.top = margins.marginTop;
+      this.customMargins_.right = margins.marginRight;
+      this.customMargins_.bottom = margins.marginBottom;
+    },
+
+    /**
      * @return {number} The value of the selected margin option.
      */
     get selectedMarginsValue() {
       var val = this.marginList_.options[this.marginList_.selectedIndex].value;
       return parseInt(val, 10);
     },
 
     /**
      * Sets the current margin selection to |lastUsedMarginsType|.
      * @param {number} lastUsedMarginsType An integer value identifying a margin
      *     type according to MarginType enum in printing/print_job_constants.h.
+     * @param {Object} lastUsedMargins The last used margins. It is undefined if

[vandebo (ex-Chrome), 2011/11/03 18:07:27]

nit: It is only used if |lastUsedMarginsType| ==
MarginSettings.MARGINS_VALUE_CUSTOM.

[dpapad, 2011/11/03 18:48:27]

Done.

+     *     |lastUsedMarginsType| differs from
+     *     |MarginSettings.MARGINS_VALUE_CUSTOM|.
      */
-    setLastUsedMarginsType: function(lastUsedMarginsType) {
+    setLastUsedMargins: function(lastUsedMarginsType, lastUsedMargins) {
+      this.forceMarginsUIOnPDFLoad_ =
+          lastUsedMarginsType == MarginSettings.MARGINS_VALUE_CUSTOM;
       this.marginList_.selectedIndex =
           this.getMarginOptionIndexByValue_(lastUsedMarginsType);
+      if (lastUsedMargins)
+        this.customMargins = lastUsedMargins;
     },
 
     /**
      * @return {number} The total width of the plugin in points.
      */
     get totalWidthInPoints() {
       var pageInformation = previewArea.pageLocationNormalized;
       return this.pageWidth_ / pageInformation.width;
     },
 
@@ skipping 294 matching lines @@
      * Executes when user selects a different margin option, ie,
      * |this.marginList_.selectedIndex| is changed.
      * @private
      */
     onMarginsChanged_: function() {
       if (this.isDefaultMarginsSelected() || this.isMinimumMarginsSelected() ||
           this.isNoMarginsSelected())
         this.onDefaultMinimumNoMarginsSelected_();
       else if (this.isCustomMarginsSelected())
         this.onCustomMarginsSelected_();
-
-      this.lastSelectedOption_ = this.selectedMarginsValue;
     },
 
     /**
      * Executes when the default or minimum or no margins option is selected.
      * @private
      */
     onDefaultMinimumNoMarginsSelected_: function() {
       this.removeCustomMarginEventListeners_();
       this.forceDisplayingMarginLines_ = true;
       setDefaultValuesAndRegeneratePreview(false);
@@ skipping 73 matching lines @@
      * If custom margins is the currently selected option then change to the
      * default margins option.
      * @private
      */
     resetMarginsIfNeeded: function() {
       if (this.isCustomMarginsSelected()) {
         this.marginList_.options[
             MarginSettings.OPTION_INDEX_DEFAULT].selected = true;
         this.removeCustomMarginEventListeners_();
         this.forceDisplayingMarginLines_ = true;
-        this.lastSelectedOption_ = MarginSettings.MARGINS_VALUE_DEFAULT;
       }
     },
 
     /**
      * Executes when a |customEvents.PDF_LOADED| event occurs.
      * @private
      */
     onPDFLoaded_: function() {
-      if (!previewModifiable)
+      if (!previewModifiable) {
         fadeOutOption(this.marginsOption_);
+        return;
+      }
+
+      if (this.forceMarginsUIOnPDFLoad_) {
+        this.onCustomMarginsSelected_();
+        this.forceMarginsUIOnPDFLoad_ = false;
+      }
     }
   };
 
   return {
     MarginSettings: MarginSettings,
     PageLayout: PageLayout,
+    setLastUsedMargins: MarginSettings.prototype.setLastUsedMargins,
     setNumberFormatAndMeasurementSystem:
         MarginSettings.setNumberFormatAndMeasurementSystem,
   };
 });