exit more gracefully if Polymer isn't loaded

bnavetta · Jan 1, 2016 · 22fc1a0 · 22fc1a0
1 parent ca50db2
commit 22fc1a0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -56,6 +56,11 @@ define(['exports', 'aurelia-framework', 'aurelia-templating-binding', 'aurelia-l
   }
 
   function configure(aurelia) {
+    if (!('Polymer' in window)) {
+      logger.error("Polymer is not loaded");
+      return;
+    }
+
     var eventManager = aurelia.container.get(_aureliaFramework.EventManager);
     var bindingLanguage = aurelia.container.get(_aureliaTemplatingBinding.TemplatingBindingLanguage);
     bindingLanguage.attributeMap['bind-value'] = 'bindValue';

diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -47,6 +47,11 @@ function registerElement(eventManager, bindingLanguage, prototype) {
 }
 
 function configure(aurelia) {
+  if (!('Polymer' in window)) {
+    logger.error("Polymer is not loaded");
+    return;
+  }
+
   var eventManager = aurelia.container.get(_aureliaFramework.EventManager);
   var bindingLanguage = aurelia.container.get(_aureliaTemplatingBinding.TemplatingBindingLanguage);
 

diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -32,6 +32,11 @@ function registerElement(eventManager, bindingLanguage, prototype) {
 }
 
 export function configure(aurelia){
+  if (!('Polymer' in window)) {
+    logger.error("Polymer is not loaded");
+    return;
+  }
+
   let eventManager = aurelia.container.get(EventManager);
   let bindingLanguage = aurelia.container.get(TemplatingBindingLanguage);
   // let observerLocator = aurelia.container.get(ObserverLocator);
@@ -49,15 +54,4 @@ export function configure(aurelia){
     oldRegistrate(prototype);
     registerElement(eventManager, bindingLanguage, prototype);
   };
-
-  // observerLocator.getArrayObserver(registrations).subscribe(changes => {
-  //   changes.forEach(change => {
-  //     if (change.type === "splice" && change.addedCount > 0) {
-  //       for (let i = 0; i < change.addedCount; i++) {
-  //         let prototype = change.object[change.index + i - 1];
-  //         registerElement(eventManager, bindingLanguage, prototype);
-  //       }
-  //     }
-  //   });
-  // });
 }
diff --git a/dist/system/index.js b/dist/system/index.js
@@ -44,6 +44,11 @@ System.register(['aurelia-framework', 'aurelia-templating-binding', 'aurelia-log
       logger = LogManager.getLogger('polymer');
 
       function configure(aurelia) {
+        if (!('Polymer' in window)) {
+          logger.error("Polymer is not loaded");
+          return;
+        }
+
         var eventManager = aurelia.container.get(EventManager);
         var bindingLanguage = aurelia.container.get(TemplatingBindingLanguage);
         bindingLanguage.attributeMap['bind-value'] = 'bindValue';

diff --git a/src/index.js b/src/index.js
@@ -32,6 +32,11 @@ function registerElement(eventManager, bindingLanguage, prototype) {
 }
 
 export function configure(aurelia){
+  if (!('Polymer' in window)) {
+    logger.error("Polymer is not loaded");
+    return;
+  }
+
   let eventManager = aurelia.container.get(EventManager);
   let bindingLanguage = aurelia.container.get(TemplatingBindingLanguage);
   // let observerLocator = aurelia.container.get(ObserverLocator);
@@ -49,15 +54,4 @@ export function configure(aurelia){
     oldRegistrate(prototype);
     registerElement(eventManager, bindingLanguage, prototype);
   };
-
-  // observerLocator.getArrayObserver(registrations).subscribe(changes => {
-  //   changes.forEach(change => {
-  //     if (change.type === "splice" && change.addedCount > 0) {
-  //       for (let i = 0; i < change.addedCount; i++) {
-  //         let prototype = change.object[change.index + i - 1];
-  //         registerElement(eventManager, bindingLanguage, prototype);
-  //       }
-  //     }
-  //   });
-  // });
 }