Revert 110035 - 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 22 matching lines @@
         Math.pow(10, precision);
   }
 
   Margins.prototype = {
     /**
      * Checks if |rhs| is equal to |this|.
      * @param {Margins} rhs The Margins object to compare against.
      * @return {boolean} true if they are equal.
      */
     isEqual: function(rhs) {
-      if (!rhs)
-        return false;
       return this[MarginSettings.TOP_GROUP] === rhs[MarginSettings.TOP_GROUP] &&
           this[MarginSettings.LEFT_GROUP] === rhs[MarginSettings.LEFT_GROUP] &&
           this[MarginSettings.RIGHT_GROUP] ===
               rhs[MarginSettings.RIGHT_GROUP] &&
           this[MarginSettings.BOTTOM_GROUP] ===
               rhs[MarginSettings.BOTTOM_GROUP];
     },
 
-    clone: function() {
-      return new Margins(this[MarginSettings.TOP_GROUP],
-                         this[MarginSettings.LEFT_GROUP],
-                         this[MarginSettings.RIGHT_GROUP],
-                         this[MarginSettings.BOTTOM_GROUP]);
+    /**
+     * Copies the four margin values from |rhs|.
+     * @param {Margins} rhs The Margins object values to be used.
+     */
+    copy: function(rhs) {
+      this[MarginSettings.TOP_GROUP] = rhs[MarginSettings.TOP_GROUP];
+      this[MarginSettings.LEFT_GROUP] = rhs[MarginSettings.LEFT_GROUP];
+      this[MarginSettings.RIGHT_GROUP] = rhs[MarginSettings.RIGHT_GROUP];
+      this[MarginSettings.BOTTOM_GROUP] = rhs[MarginSettings.BOTTOM_GROUP];
     },
 
     /**
      * Helper method returning an array of the string indices used for accessing
      * all margins.
      * @return {array} An array of string indices.
      * @private
      */
     indicesAsArray_: function() {
       return [MarginSettings.LEFT_GROUP, MarginSettings.TOP_GROUP,
@@ skipping 16 matching lines @@
   };
 
   /**
    * @constructor
    * Class describing the layout of the page.
    */
   function PageLayout(width, height, left, top, right, bottom) {
     this.contentWidth_ = width;
     this.contentHeight_ = height;
     this.margins_ = new Margins(left, top, right, bottom);
-    this.margins_.roundToLocaleUnits();
   }
 
   PageLayout.prototype = {
     /**
      * @type {number} The width of the page.
      */
     get pageWidth() {
       return this.margins_.left + this.margins_.right + this.contentWidth_;
     },
 
     /**
      * @type {number} The height of the page.
      */
     get pageHeight() {
       return this.margins_.top + this.margins_.bottom + this.contentHeight_;
     }
   };
 
   /**
    * Creates a MarginSettings object. This object encapsulates all settings and
    * logic related to the margins mode.
    * @constructor
    */
   function MarginSettings() {
     this.marginsOption_ = $('margins-option');
     this.marginList_ = $('margin-list');
     this.marginsUI_ = null;
 
     // Holds the custom margin values in points (if set).
-    this.customMargins_ = null;
+    this.customMargins_ = new Margins(-1, -1, -1, -1);
     // Holds the previous custom margin values in points.
-    this.previousCustomMargins_ = null;
+    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;
-    // @type {boolean} True if the margins UI should be diplayed when the next
-    //     |customEvents.PDF_LOADED| event occurs.
-    this.forceMarginsUIOnPDFLoad_ = false;
+    // The last selected margin option.
+    this.lastSelectedOption_ = MarginSettings.MARGINS_VALUE_DEFAULT;
+
     // 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.
     this.eventTracker_ = new EventTracker();
 
     this.addEventListeners_();
   }
 
@@ skipping 46 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: number,
-     *     marginBottom: 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 |lastUsedMarginType|.
-     * @param {number} lastUsedMarginType An integer value identifying a margin
+     * 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} lastUsedCustomMargins The last used custom margins. If
-     *     custom margins have not been used before
-     *     |margin{Top|Bottom|Left|Right}| attributes are missing.
      */
-    setLastUsedMargins: function(lastUsedMarginsSettings) {
-      var lastUsedMarginsType = lastUsedMarginsSettings['marginsType']
-      this.forceMarginsUIOnPDFLoad_ =
-          lastUsedMarginsType == MarginSettings.MARGINS_VALUE_CUSTOM;
+    setLastUsedMarginsType: function(lastUsedMarginsType) {
       this.marginList_.selectedIndex =
           this.getMarginOptionIndexByValue_(lastUsedMarginsType);
-      if (lastUsedMarginsSettings.hasOwnProperty('marginTop') &&
-          lastUsedMarginsSettings.hasOwnProperty('marginBottom') &&
-          lastUsedMarginsSettings.hasOwnProperty('marginRight') &&
-          lastUsedMarginsSettings.hasOwnProperty('marginLeft')) {
-        this.customMargins_ = new Margins(-1, -1, -1 , -1);
-        this.customMargins = lastUsedMarginsSettings;
-      }
     },
 
     /**
      * @return {number} The total width of the plugin in points.
      */
     get totalWidthInPoints() {
       var pageInformation = previewArea.pageLocationNormalized;
       return this.pageWidth_ / pageInformation.width;
     },
 
@@ skipping 52 matching lines @@
     },
 
     /**
      * If the custom margin values have changed then request a new preview based
      * on the newly set margins.
      * @private
      */
     requestPreviewIfNeeded_: function() {
       if (!this.areMarginSettingsValid())
         return;
-
       if (this.customMargins_.isEqual(this.previousCustomMargins_))
         return;
-
-      this.previousCustomMargins_ = this.customMargins_.clone();
+      this.previousCustomMargins_.copy(this.customMargins_);
       setDefaultValuesAndRegeneratePreview(false);
     },
 
     /**
      * Listener executed when the mouse is over the sidebar. If the custom
      * margin lines are displayed, then, it fades them out.
      * @private
      */
     onSidebarMouseOver_: function(e) {
-      $('mainview').onmouseover = this.onMainviewMouseOver_.bind(this);
-      $('navbar-container').onmouseover = null;
       if (!this.forceDisplayingMarginLines_)
         this.marginsUI.hide(false);
     },
 
     /**
      * Listener executed when the mouse is over the main view. If the custom
      * margin lines are hidden, then, it fades them in.
      * @private
      */
     onMainviewMouseOver_: function() {
-      $('mainview').onmouseover = null;
-      $('navbar-container').onmouseover = this.onSidebarMouseOver_.bind(this);
       this.forceDisplayingMarginLines_ = false;
       this.marginsUI.show();
     },
 
     /**
      * Adds listeners to all margin related controls.
      * @private
      */
     addEventListeners_: function() {
       this.marginList_.onchange = this.onMarginsChanged_.bind(this);
@@ skipping 36 matching lines @@
         return dragDelta * this.totalHeightInPoints;
       } else {
         return dragDelta * this.totalWidthInPoints;
       }
     },
 
     /**
      * @return {boolean} True if the margin settings are valid.
      */
     areMarginSettingsValid: function() {
-      if (!this.isCustomMarginsSelected() || !this.marginsUI_)
+      if (this.marginsUI_ == null)
         return true;
 
       var pairs = this.marginsUI.pairsAsList;
       return pairs.every(function(pair) { return pair.box_.isValid; });
     },
 
     /**
      * Calculates the maximum allowable value of the selected margin text for
      * every margin.
      * @return {array} The maximum allowable value in points in order top, left,
@@ skipping 85 matching lines @@
                              false);
       this.eventTracker_.add(document, customEvents.MARGIN_TEXTBOX_FOCUSED,
                              this.onMarginTextboxFocused_.bind(this), false);
     },
 
     /**
      * Removes the event listeners associated with the custom margins option.
      * @private
      */
     removeCustomMarginEventListeners_: function() {
-      if (!this.marginsUI_)
-        return;
       $('mainview').onmouseover = null;
       $('navbar-container').onmouseover = null;
       this.eventTracker_.remove(this.marginsUI, customEvents.MARGIN_LINE_DRAG);
       this.eventTracker_.remove(document, customEvents.MARGIN_TEXTBOX_FOCUSED);
       this.marginsUI.hide(true);
     },
 
     /**
      * Updates |this.marginsUI| depending on the specified margins and the
      * position of the page within the plugin.
@@ skipping 38 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;
-      this.previousCustomMargins_ = null;
       setDefaultValuesAndRegeneratePreview(false);
     },
 
     /**
      * Executes when the custom margins option is selected.
      * @private
      */
     onCustomMarginsSelected_: function() {
-      var customMarginsNotSpecified = !this.customMargins_;
-      this.updatePageData_();
+      this.addCustomMarginEventListeners_();
 
-      if (customMarginsNotSpecified) {
-        this.previousCustomMargins_ = this.customMargins_.clone();
-        this.drawCustomMarginsUI_();
-        this.addCustomMarginEventListeners_();
-        this.marginsUI.show();
-      } else {
-        this.forceMarginsUIOnPDFLoad_ = true;
-        this.requestPreviewIfNeeded_();
+      this.customMargins_ = this.currentDefaultPageLayout.margins_;
+      this.customMargins_.roundToLocaleUnits();
+      this.previousCustomMargins_.copy(this.customMargins_);
+
+      if (this.previousDefaultPageLayout_ != this.currentDefaultPageLayout) {
+        this.pageWidth_ = this.currentDefaultPageLayout.pageWidth;
+        this.pageHeight_ = this.currentDefaultPageLayout.pageHeight;
       }
+
+      this.previousDefaultPageLayout_ = this.currentDefaultPageLayout;
+      this.drawCustomMarginsUI_();
+      this.marginsUI.show();
     },
 
     /**
      * Calculates the coordinates of the four margin lines. These are the
      * coordinates where the margin lines should be displayed. The coordinates
      * are expressed in terms of percentages with respect to the total width
      * and height of the plugin.
      * @return {print_preview.Rect} A rectnangle that describes the position of
      *     the four margin lines.
      * @private
@@ skipping 42 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.customMargins_ = null;
-        this.previousCustomMargins_ = null;
+        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.updatePageData_();
-        this.drawCustomMarginsUI_();
-        this.addCustomMarginEventListeners_();
-        this.marginsUI.show();
-        this.forceMarginsUIOnPDFLoad_ = false;
-      }
-    },
-
-    /**
-     * Updates |this.customMargins_|, |this.pageWidth_|, |this.pageHeight_|.
-     * @private
-     */
-    updatePageData_: function() {
-      if (!this.customMargins_)
-        this.customMargins_ = this.currentDefaultPageLayout.margins_.clone();
-
-      this.pageWidth_ = this.currentDefaultPageLayout.pageWidth;
-      this.pageHeight_ = this.currentDefaultPageLayout.pageHeight;
     }
   };
 
   return {
     MarginSettings: MarginSettings,
     PageLayout: PageLayout,
+    setNumberFormatAndMeasurementSystem:
+        MarginSettings.setNumberFormatAndMeasurementSystem,
   };
 });