Skip to content

Commit

Permalink
Merge pull request mozilla#5744 from Snuffleupagus/reset-auto-zoom-re…
Browse files Browse the repository at this point in the history
…gression

Fix regression that prevents resetting the zoom level to "Automatic" when using the |Ctrl + 0| keys
  • Loading branch information
yurydelendik authored and speedplane committed Mar 4, 2015
2 parents 7f7d750 + a495ab0 commit 6b9cb8f
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions web/pdf_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,27 @@ var PDFViewer = (function pdfViewer() {
}
},

_setScaleDispatchEvent: function pdfViewer_setScaleDispatchEvent(
newScale, newValue, preset) {
var event = document.createEvent('UIEvents');
event.initUIEvent('scalechange', true, true, window, 0);
event.scale = newScale;
if (preset) {
event.presetValue = newValue;
}
this.container.dispatchEvent(event);
},

_setScaleUpdatePages: function pdfViewer_setScaleUpdatePages(
newScale, newValue, noScroll, preset) {
this._currentScaleValue = newValue;
if (newScale === this._currentScale) {
if (preset) {
this._setScaleDispatchEvent(newScale, newValue, true);
}
return;
}

for (var i = 0, ii = this.pages.length; i < ii; i++) {
this.pages[i].update(newScale);
}
Expand All @@ -360,13 +375,7 @@ var PDFViewer = (function pdfViewer() {
this.scrollPageIntoView(page, dest);
}

var event = document.createEvent('UIEvents');
event.initUIEvent('scalechange', true, true, window, 0);
event.scale = newScale;
if (preset) {
event.presetValue = newValue;
}
this.container.dispatchEvent(event);
this._setScaleDispatchEvent(newScale, newValue, preset);
},

_setScale: function pdfViewer_setScale(value, noScroll) {
Expand Down

0 comments on commit 6b9cb8f

Please sign in to comment.