Issue 140323002: Reset margins when destination selected, not when capabilities are ready. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(223)

My Issues | Starred Open | Closed | All

Issue 140323002: Reset margins when destination selected, not when capabilities are ready. (Closed)

Created:
6 years, 11 months ago by Vitaly Buka (NO REVIEWS)

Modified:
6 years, 11 months ago

Reviewers:
Noam Samuel

CC:
chromium-reviews, arv+watch_chromium.org

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

Reset margins when destination selected, not when capabilities are ready. BUG=332183 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245288

Patch Set 1 #

Patch Set 2 : #

Created: 6 years, 11 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+21 lines, -8 lines)			Patch
	M	chrome/browser/resources/print_preview/data/print_ticket_store.js	View	1	3 chunks	+21 lines, -8 lines	0 comments	Download

Messages

Total messages: 8 (0 generated)

Expand Messages | Collapse Messages

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/140323002/1

6 years, 11 months ago (2014-01-16 01:30:07 UTC) #3

commit-bot: I haz the power

Failed to apply patch for chrome/browser/resources/print_preview/data/print_ticket_store.js: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years, 11 months ago (2014-01-16 01:30:09 UTC) #4

Failed to apply patch for
chrome/browser/resources/print_preview/data/print_ticket_store.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/resources/print_preview/data/print_ticket_store.js
  Hunk #3 FAILED at 443.
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/resources/print_preview/data/print_ticket_store.js.rej

Patch:       chrome/browser/resources/print_preview/data/print_ticket_store.js
Index: chrome/browser/resources/print_preview/data/print_ticket_store.js
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
963ee20683a7a67d371b3d8b51c9b3013b70cbcd..267b539ee3919aab054042632005fdf66d2f65db
100644
--- a/chrome/browser/resources/print_preview/data/print_ticket_store.js
+++ b/chrome/browser/resources/print_preview/data/print_ticket_store.js
@@ -390,6 +390,11 @@ cr.define('print_preview', function() {
     addEventListeners_: function() {
       this.tracker_.add(
           this.destinationStore_,
+          print_preview.DestinationStore.EventType.DESTINATION_SELECT,
+          this.onDestinationSelect_.bind(this));
+
+      this.tracker_.add(
+          this.destinationStore_,
           print_preview.DestinationStore.EventType.
               SELECTED_DESTINATION_CAPABILITIES_READY,
           this.onSelectedDestinationCapabilitiesReady_.bind(this));
@@ -411,6 +416,22 @@ cr.define('print_preview', function() {
     },
 
     /**
+     * Called when the destination selected.
+     * @private
+     */
+    onDestinationSelect_: function() {
+      // Reset user selection for certain ticket items.
+      if (this.capabilitiesHolder_.get() != null) {
+        this.customMargins_.updateValue(null);
+        if (this.marginsType_.getValue() ==
+            print_preview.ticket_items.MarginsType.Value.CUSTOM) {
+          this.marginsType_.updateValue(
+              print_preview.ticket_items.MarginsType.Value.DEFAULT);
+        }
+      }
+    },
+
+    /**
      * Called when the capabilities of the selected destination are ready.
      * @private
      */
@@ -422,15 +443,6 @@ cr.define('print_preview', function() {
         this.isInitialized_ = true;
         cr.dispatchSimpleEvent(this, PrintTicketStore.EventType.INITIALIZE);
       } else {
-        // Reset user selection for certain ticket items.
-        if (this.marginsType_.getValue() ==
-            print_preview.ticket_items.MarginsType.Value.CUSTOM &&
-            !this.customMargins_.wouldValueBeValid(
-                 this.customMargins_.getValue())) {
-          this.customMargins_.updateValue(null);
-          this.marginsType_.updateValue(
-              print_preview.ticket_items.MarginsType.Value.DEFAULT);
-        }
         cr.dispatchSimpleEvent(
             this, PrintTicketStore.EventType.CAPABILITIES_CHANGE);
       }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/140323002/1

6 years, 11 months ago (2014-01-16 04:28:03 UTC) #5

commit-bot: I haz the power

Failed to apply patch for chrome/browser/resources/print_preview/data/print_ticket_store.js: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...

6 years, 11 months ago (2014-01-16 04:28:05 UTC) #6

Failed to apply patch for
chrome/browser/resources/print_preview/data/print_ticket_store.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
chrome/browser/resources/print_preview/data/print_ticket_store.js
  Hunk #3 FAILED at 443.
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/resources/print_preview/data/print_ticket_store.js.rej

Patch:       chrome/browser/resources/print_preview/data/print_ticket_store.js
Index: chrome/browser/resources/print_preview/data/print_ticket_store.js
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
963ee20683a7a67d371b3d8b51c9b3013b70cbcd..267b539ee3919aab054042632005fdf66d2f65db
100644
--- a/chrome/browser/resources/print_preview/data/print_ticket_store.js
+++ b/chrome/browser/resources/print_preview/data/print_ticket_store.js
@@ -390,6 +390,11 @@ cr.define('print_preview', function() {
     addEventListeners_: function() {
       this.tracker_.add(
           this.destinationStore_,
+          print_preview.DestinationStore.EventType.DESTINATION_SELECT,
+          this.onDestinationSelect_.bind(this));
+
+      this.tracker_.add(
+          this.destinationStore_,
           print_preview.DestinationStore.EventType.
               SELECTED_DESTINATION_CAPABILITIES_READY,
           this.onSelectedDestinationCapabilitiesReady_.bind(this));
@@ -411,6 +416,22 @@ cr.define('print_preview', function() {
     },
 
     /**
+     * Called when the destination selected.
+     * @private
+     */
+    onDestinationSelect_: function() {
+      // Reset user selection for certain ticket items.
+      if (this.capabilitiesHolder_.get() != null) {
+        this.customMargins_.updateValue(null);
+        if (this.marginsType_.getValue() ==
+            print_preview.ticket_items.MarginsType.Value.CUSTOM) {
+          this.marginsType_.updateValue(
+              print_preview.ticket_items.MarginsType.Value.DEFAULT);
+        }
+      }
+    },
+
+    /**
      * Called when the capabilities of the selected destination are ready.
      * @private
      */
@@ -422,15 +443,6 @@ cr.define('print_preview', function() {
         this.isInitialized_ = true;
         cr.dispatchSimpleEvent(this, PrintTicketStore.EventType.INITIALIZE);
       } else {
-        // Reset user selection for certain ticket items.
-        if (this.marginsType_.getValue() ==
-            print_preview.ticket_items.MarginsType.Value.CUSTOM &&
-            !this.customMargins_.wouldValueBeValid(
-                 this.customMargins_.getValue())) {
-          this.customMargins_.updateValue(null);
-          this.marginsType_.updateValue(
-              print_preview.ticket_items.MarginsType.Value.DEFAULT);
-        }
         cr.dispatchSimpleEvent(
             this, PrintTicketStore.EventType.CAPABILITIES_CHANGE);
       }

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/vitalybuka@chromium.org/140323002/90002

6 years, 11 months ago (2014-01-16 05:52:48 UTC) #7

Message was sent while issue was closed.

Change committed as 245288

Expand Messages | Collapse Messages

Powered by Google App Engine

This is Rietveld 408576698