loader always calls the callback even when no work is required.

googlearchive · Jan 18, 2014 · 0c3bf9d · 0c3bf9d
1 parent 0d211f4
commit 0c3bf9d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/loader.js b/src/loader.js
@@ -17,15 +17,18 @@ var loader = {
       } else {
         this.platformLoadStyles(styles, callback);
       }
-      return true;
+    } else if (callback) {
+      callback();
     }
   },
   findLoadableStyles: function(root) {
     var loadables = [];
-    var s$ = root.querySelectorAll(STYLE_SELECTOR);
-    for (var i=0, l=s$.length, s; (i<l) && (s=s$[i]); i++) {
-      if (s.textContent.match(STYLE_LOADABLE_MATCH)) {
-        loadables.push(s);
+    if (root) {
+      var s$ = root.querySelectorAll(STYLE_SELECTOR);
+      for (var i=0, l=s$.length, s; (i<l) && (s=s$[i]); i++) {
+        if (s.textContent.match(STYLE_LOADABLE_MATCH)) {
+          loadables.push(s);
+        }
       }
     }
     return loadables;