Merge pull request #9058 from Snuffleupagus/web-more-let
Replace a few occurences of `var` with `let` in already ES6 converted web/ files
This commit is contained in:
commit
ef4a13534d
@ -581,7 +581,7 @@ function isDestArraysEqual(firstDest, secondDest) {
|
|||||||
if (Object.keys(first).length !== Object.keys(second).length) {
|
if (Object.keys(first).length !== Object.keys(second).length) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (var key in first) {
|
for (let key in first) {
|
||||||
if (!isEntryEqual(first[key], second[key])) {
|
if (!isEntryEqual(first[key], second[key])) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -103,14 +103,14 @@ class PDFRenderingQueue {
|
|||||||
* 2. if last scrolled down, the page after the visible pages, or
|
* 2. if last scrolled down, the page after the visible pages, or
|
||||||
* if last scrolled up, the page before the visible pages
|
* if last scrolled up, the page before the visible pages
|
||||||
*/
|
*/
|
||||||
var visibleViews = visible.views;
|
let visibleViews = visible.views;
|
||||||
|
|
||||||
var numVisible = visibleViews.length;
|
let numVisible = visibleViews.length;
|
||||||
if (numVisible === 0) {
|
if (numVisible === 0) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
for (var i = 0; i < numVisible; ++i) {
|
for (let i = 0; i < numVisible; ++i) {
|
||||||
var view = visibleViews[i].view;
|
let view = visibleViews[i].view;
|
||||||
if (!this.isViewFinished(view)) {
|
if (!this.isViewFinished(view)) {
|
||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
@ -118,13 +118,13 @@ class PDFRenderingQueue {
|
|||||||
|
|
||||||
// All the visible views have rendered; try to render next/previous pages.
|
// All the visible views have rendered; try to render next/previous pages.
|
||||||
if (scrolledDown) {
|
if (scrolledDown) {
|
||||||
var nextPageIndex = visible.last.id;
|
let nextPageIndex = visible.last.id;
|
||||||
// IDs start at 1, so no need to add 1.
|
// IDs start at 1, so no need to add 1.
|
||||||
if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex])) {
|
if (views[nextPageIndex] && !this.isViewFinished(views[nextPageIndex])) {
|
||||||
return views[nextPageIndex];
|
return views[nextPageIndex];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var previousPageIndex = visible.first.id - 2;
|
let previousPageIndex = visible.first.id - 2;
|
||||||
if (views[previousPageIndex] &&
|
if (views[previousPageIndex] &&
|
||||||
!this.isViewFinished(views[previousPageIndex])) {
|
!this.isViewFinished(views[previousPageIndex])) {
|
||||||
return views[previousPageIndex];
|
return views[previousPageIndex];
|
||||||
@ -162,7 +162,7 @@ class PDFRenderingQueue {
|
|||||||
break;
|
break;
|
||||||
case RenderingStates.INITIAL:
|
case RenderingStates.INITIAL:
|
||||||
this.highestPriorityPage = view.renderingId;
|
this.highestPriorityPage = view.renderingId;
|
||||||
var continueRendering = () => {
|
let continueRendering = () => {
|
||||||
this.renderHighestPriority();
|
this.renderHighestPriority();
|
||||||
};
|
};
|
||||||
view.draw().then(continueRendering, continueRendering);
|
view.draw().then(continueRendering, continueRendering);
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import { cloneObj } from './ui_utils';
|
import { cloneObj } from './ui_utils';
|
||||||
|
|
||||||
var defaultPreferences = null;
|
let defaultPreferences = null;
|
||||||
function getDefaultPreferences() {
|
function getDefaultPreferences() {
|
||||||
if (!defaultPreferences) {
|
if (!defaultPreferences) {
|
||||||
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
|
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
|
||||||
@ -23,7 +23,7 @@ function getDefaultPreferences() {
|
|||||||
PDFJSDev.json('$ROOT/web/default_preferences.json'));
|
PDFJSDev.json('$ROOT/web/default_preferences.json'));
|
||||||
} else {
|
} else {
|
||||||
defaultPreferences = new Promise(function (resolve) {
|
defaultPreferences = new Promise(function (resolve) {
|
||||||
var xhr = new XMLHttpRequest();
|
let xhr = new XMLHttpRequest();
|
||||||
xhr.open('GET', 'default_preferences.json');
|
xhr.open('GET', 'default_preferences.json');
|
||||||
xhr.onload = xhr.onerror = function loaded() {
|
xhr.onload = xhr.onerror = function loaded() {
|
||||||
try {
|
try {
|
||||||
@ -130,8 +130,8 @@ class BasePreferences {
|
|||||||
} else if (value === undefined) {
|
} else if (value === undefined) {
|
||||||
throw new Error('Set preference: no value is specified.');
|
throw new Error('Set preference: no value is specified.');
|
||||||
}
|
}
|
||||||
var valueType = typeof value;
|
let valueType = typeof value;
|
||||||
var defaultType = typeof this.defaults[name];
|
let defaultType = typeof this.defaults[name];
|
||||||
|
|
||||||
if (valueType !== defaultType) {
|
if (valueType !== defaultType) {
|
||||||
if (valueType === 'number' && defaultType === 'string') {
|
if (valueType === 'number' && defaultType === 'string') {
|
||||||
@ -158,12 +158,12 @@ class BasePreferences {
|
|||||||
*/
|
*/
|
||||||
get(name) {
|
get(name) {
|
||||||
return this._initializedPromise.then(() => {
|
return this._initializedPromise.then(() => {
|
||||||
var defaultValue = this.defaults[name];
|
let defaultValue = this.defaults[name];
|
||||||
|
|
||||||
if (defaultValue === undefined) {
|
if (defaultValue === undefined) {
|
||||||
throw new Error(`Get preference: "${name}" is undefined.`);
|
throw new Error(`Get preference: "${name}" is undefined.`);
|
||||||
} else {
|
} else {
|
||||||
var prefValue = this.prefs[name];
|
let prefValue = this.prefs[name];
|
||||||
|
|
||||||
if (prefValue !== undefined) {
|
if (prefValue !== undefined) {
|
||||||
return prefValue;
|
return prefValue;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user