Merge pull request mozilla#7944 from yurydelendik/rm-defpref

Removes Promise usage from preferences.js
movsb · Jan 10, 2017 · d613359 · d613359
2 parents 1027edb + 151a44d
commit d613359
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 66 deletions.
diff --git a/web/default_preferences.js b/web/default_preferences.js
diff --git a/web/preferences.js b/web/preferences.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals DEFAULT_PREFERENCES */
 
 'use strict';
 
@@ -26,21 +25,29 @@
   }
 }(this, function (exports) {
 
-var defaultPreferences;
-if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
-  defaultPreferences = Promise.resolve(
-    PDFJSDev.json('$ROOT/web/default_preferences.json'));
-} else {
-  defaultPreferences = new Promise(function (resolve) {
-    if (DEFAULT_PREFERENCES) {
-      resolve(DEFAULT_PREFERENCES);
-      return;
+var defaultPreferences = null;
+function getDefaultPreferences() {
+  if (!defaultPreferences) {
+    if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('PRODUCTION')) {
+      defaultPreferences = Promise.resolve(
+        PDFJSDev.json('$ROOT/web/default_preferences.json'));
+    } else {
+      defaultPreferences = new Promise(function (resolve) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', 'default_preferences.json');
+        xhr.onload = xhr.onerror = function loaded() {
+          try {
+            resolve(JSON.parse(xhr.responseText));
+          } catch (e) {
+            console.error('Unable to load default preferences: ' + e);
+            resolve({});
+          }
+        };
+        xhr.send();
+      });
     }
-    document.addEventListener('defaultpreferencesloaded', function loaded() {
-      resolve(DEFAULT_PREFERENCES);
-      document.removeEventListener('defaultpreferencesloaded', loaded);
-    });
-  });
+  }
+  return defaultPreferences;
 }
 
 function cloneObj(obj) {
@@ -69,7 +76,7 @@ var Preferences = {
    *                   have been initialized.
    */
   initialize: function preferencesInitialize() {
-    return this.initializedPromise = defaultPreferences.then(
+    return this.initializedPromise = getDefaultPreferences().then(
         function (defaults) {
 
       Object.defineProperty(this, 'defaults', {

diff --git a/web/viewer.html b/web/viewer.html
@@ -60,10 +60,6 @@
 <!--#include viewer-snippet.html-->
 <!--#endif-->
 
-<!--#if !PRODUCTION-->
-    <script src="default_preferences.js"></script>
-<!--#endif-->
-
 <!--#if !MINIFIED -->
     <script src="viewer.js"></script>
 <!--#else-->

diff --git a/web/viewer.js b/web/viewer.js
@@ -169,20 +169,19 @@ function webViewerLoad() {
   var config = getViewerConfiguration();
   if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
     require.config({paths: {'pdfjs': '../src', 'pdfjs-web': '.'}});
-    require(['pdfjs-web/pdfjs'], function () {
-      // Ensure that src/main_loader.js has loaded all the necessary
-      // dependencies *before* the viewer loads, to prevent issues in browsers
-      // relying on e.g. the Promise/URL polyfill in src/shared/util.js (fixes
-      // issue 7448).
-      require(['pdfjs-web/app', 'pdfjs-web/pdf_print_service'], function (web) {
-        window.PDFViewerApplication = web.PDFViewerApplication;
-        web.PDFViewerApplication.run(config);
-      });
+    require(['pdfjs-web/app', 'pdfjs-web/pdf_print_service'], function (web) {
+      window.PDFViewerApplication = web.PDFViewerApplication;
+      web.PDFViewerApplication.run(config);
     });
   } else {
     window.PDFViewerApplication = pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication;
     pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication.run(config);
   }
 }
 
-document.addEventListener('DOMContentLoaded', webViewerLoad, true);
+if (document.readyState === 'interactive' ||
+    document.readyState === 'complete') {
+  webViewerLoad();
+} else {
+  document.addEventListener('DOMContentLoaded', webViewerLoad, true);
+}