Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8576 from Snuffleupagus/toolbar-inline-selectScaleOption

Browse Source 
Remove the `selectScaleOption` helper function, in `Toolbar._updateUIState`, and simply inline its code instead
This commit is contained in:
Tim van der Meij 2017-06-26 23:28:43 +02:00 committed by GitHub
commit f87f0d6812
1 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
web/toolbar.js
View File

@ -96,9 +96,8 @@ class Toolbar {
} }
_bindListeners() { _bindListeners() {
let eventBus = this.eventBus; let { eventBus, items, } = this;
let self = this; let self = this;
let items = this.items;
items.previous.addEventListener('click', function() { items.previous.addEventListener('click', function() {
eventBus.dispatch('previouspage'); eventBus.dispatch('previouspage');
@ -172,36 +171,10 @@ class Toolbar {
// Don't update the UI state until we localize the toolbar. // Don't update the UI state until we localize the toolbar.
return; return;
} }
let { pageNumber, pagesCount, items, } = this;
let selectScaleOption = (value, scale) => {
let customScale = Math.round(scale * 10000) / 100;
this.l10n.get('page_scale_percent', { scale: customScale, },
'{{scale}}%').then((msg) => {
let options = items.scaleSelect.options;
let predefinedValueFound = false;
for (let i = 0, ii = options.length; i < ii; i++) {
let option = options[i];
if (option.value !== value) {
option.selected = false;
continue;
}
option.selected = true;
predefinedValueFound = true;
}
if (!predefinedValueFound) {
items.customScaleOption.textContent = msg;
items.customScaleOption.selected = true;
}
});
};
let pageNumber = this.pageNumber;
let scaleValue = (this.pageScaleValue || this.pageScale).toString(); let scaleValue = (this.pageScaleValue || this.pageScale).toString();
let scale = this.pageScale; let scale = this.pageScale;
let items = this.items;
let pagesCount = this.pagesCount;
if (resetNumPages) { if (resetNumPages) {
if (this.hasPageLabels) { if (this.hasPageLabels) {
items.pageNumber.type = 'text'; items.pageNumber.type = 'text';
@ -218,8 +191,7 @@ class Toolbar {
if (this.hasPageLabels) { if (this.hasPageLabels) {
items.pageNumber.value = this.pageLabel; items.pageNumber.value = this.pageLabel;
this.l10n.get('page_of_pages', { pageNumber, pagesCount, }, this.l10n.get('page_of_pages', { pageNumber, pagesCount, },
'({{pageNumber}} of {{pagesCount}})'). '({{pageNumber}} of {{pagesCount}})').then((msg) => {
then((msg) => {
items.numPages.textContent = msg; items.numPages.textContent = msg;
}); });
} else { } else {
@ -232,7 +204,25 @@ class Toolbar {
items.zoomOut.disabled = (scale <= MIN_SCALE); items.zoomOut.disabled = (scale <= MIN_SCALE);
items.zoomIn.disabled = (scale >= MAX_SCALE); items.zoomIn.disabled = (scale >= MAX_SCALE);
selectScaleOption(scaleValue, scale); let customScale = Math.round(scale * 10000) / 100;
this.l10n.get('page_scale_percent', { scale: customScale, },
'{{scale}}%').then((msg) => {
let options = items.scaleSelect.options;
let predefinedValueFound = false;
for (let i = 0, ii = options.length; i < ii; i++) {
let option = options[i];
if (option.value !== scaleValue) {
option.selected = false;
continue;
}
option.selected = true;
predefinedValueFound = true;
}
if (!predefinedValueFound) {
items.customScaleOption.textContent = msg;
items.customScaleOption.selected = true;
}
});
} }
updateLoadingIndicatorState(loading = false) { updateLoadingIndicatorState(loading = false) {