chrome/browser/resources/print_preview/preview_generator.js - Issue 12209086: Page range comparisons should use document size.

Unified Diff: chrome/browser/resources/print_preview/preview_generator.js

Issue 12209086: Page range comparisons should use document size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/print_preview/native_layer.js ('K') | « chrome/browser/resources/print_preview/native_layer.js ('k') | chrome/browser/resources/print_preview/print_preview_utils.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/print_preview/preview_generator.js

diff --git a/chrome/browser/resources/print_preview/preview_generator.js b/chrome/browser/resources/print_preview/preview_generator.js

index 431bac1064b4457ed0fc15df944eeb73b14b2daa..cc79f35adfcf2b4b6ffab9758c8c02a7285ba0c2 100644

--- a/chrome/browser/resources/print_preview/preview_generator.js

+++ b/chrome/browser/resources/print_preview/preview_generator.js

@@ -77,11 +77,11 @@ cr.define('print_preview', function() {

this.isFitToPageEnabled_ = false;

/**

- * Page number set used to generate the last preview.

- * @type {print_preview.PageNumberSet}

+ * Page ranges setting used used to generate the last preview.

+ * @type {!Array.<object.<{from: number, to: number}>>}

Toscano 2013/02/12 01:39:05 Plz use type PageIntervalSet.

* @private

- this.pageNumberSet_ = null;

+ this.pageRanges_ = null;

/**

* Margins type used to generate the last preview.

@@ -158,7 +158,7 @@ cr.define('print_preview', function() {

this.printTicketStore_.isHeaderFooterEnabled();

this.isColorEnabled_ = this.printTicketStore_.isColorEnabled();

this.isFitToPageEnabled_ = this.printTicketStore_.isFitToPageEnabled();

- this.pageNumberSet_ = this.printTicketStore_.getPageNumberSet();

+ this.pageRanges_ = this.printTicketStore_.getPageRanges();

this.marginsType_ = this.printTicketStore_.getMarginsType();

this.isCssBackgroundEnabled_ =

this.printTicketStore_.isCssBackgroundEnabled();

@@ -259,7 +259,8 @@ cr.define('print_preview', function() {

ticketStore.isHeaderFooterEnabled() != this.isHeaderFooterEnabled_ ||

ticketStore.isColorEnabled() != this.isColorEnabled_ ||

ticketStore.isFitToPageEnabled() != this.isFitToPageEnabled_ ||

- !ticketStore.getPageNumberSet().equals(this.pageNumberSet_) ||

+ this.pageRanges_ == null ||

+ !areRangesEqual(ticketStore.getPageRanges(), this.pageRanges_) ||

Toscano 2013/02/12 01:39:05 Here you would use PageIntervalSet's equals method

(ticketStore.getMarginsType() != this.marginsType_ &&

ticketStore.getMarginsType() !=

print_preview.ticket_items.MarginsType.Value.CUSTOM) ||

@@ -323,7 +324,7 @@ cr.define('print_preview', function() {

return; // Ignore old response.

}

this.printTicketStore_.updatePageCount(event.pageCount);

- this.pageNumberSet_ = this.printTicketStore_.getPageNumberSet();

+ this.pageRanges_ = this.printTicketStore_.getPageRanges();

Toscano 2013/02/12 01:39:05 In the event that page count changes, this shouldn

/**