Skip to content

Commit ac2d4ab

Browse files
committed
Removes web/default_preferences.js file.
1 parent f828f07 commit ac2d4ab

File tree

3 files changed

+23
-56
lines changed

3 files changed

+23
-56
lines changed

web/default_preferences.js

Lines changed: 0 additions & 36 deletions
This file was deleted.

web/preferences.js

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15-
/* globals DEFAULT_PREFERENCES */
1615

1716
'use strict';
1817

@@ -26,21 +25,29 @@
2625
}
2726
}(this, function (exports) {
2827

29-
var defaultPreferences;
30-
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
31-
defaultPreferences = Promise.resolve(
32-
PDFJSDev.json('$ROOT/web/default_preferences.json'));
33-
} else {
34-
defaultPreferences = new Promise(function (resolve) {
35-
if (DEFAULT_PREFERENCES) {
36-
resolve(DEFAULT_PREFERENCES);
37-
return;
28+
var defaultPreferences = null;
29+
function getDefaultPreferences() {
30+
if (!defaultPreferences) {
31+
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
32+
defaultPreferences = Promise.resolve(
33+
PDFJSDev.json('$ROOT/web/default_preferences.json'));
34+
} else {
35+
defaultPreferences = new Promise(function (resolve) {
36+
var xhr = new XMLHttpRequest();
37+
xhr.open('GET', 'default_preferences.json');
38+
xhr.onload = xhr.onerror = function loaded() {
39+
try {
40+
resolve(JSON.parse(xhr.responseText));
41+
} catch (e) {
42+
console.error('Unable to load default preferences: ' + e);
43+
resolve({});
44+
}
45+
};
46+
xhr.send();
47+
});
3848
}
39-
document.addEventListener('defaultpreferencesloaded', function loaded() {
40-
resolve(DEFAULT_PREFERENCES);
41-
document.removeEventListener('defaultpreferencesloaded', loaded);
42-
});
43-
});
49+
}
50+
return defaultPreferences;
4451
}
4552

4653
function cloneObj(obj) {
@@ -69,7 +76,7 @@ var Preferences = {
6976
* have been initialized.
7077
*/
7178
initialize: function preferencesInitialize() {
72-
return this.initializedPromise = defaultPreferences.then(
79+
return this.initializedPromise = getDefaultPreferences().then(
7380
function (defaults) {
7481

7582
Object.defineProperty(this, 'defaults', {

web/viewer.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
<!--#include viewer-snippet.html-->
6161
<!--#endif-->
6262

63-
<!--#if !PRODUCTION-->
64-
<script src="default_preferences.js"></script>
65-
<!--#endif-->
66-
6763
<!--#if !MINIFIED -->
6864
<script src="viewer.js"></script>
6965
<!--#else-->

0 commit comments

Comments
 (0)