removed setTimeout, added examples

kubetail-org · Mar 20, 2016 · 8d76a07 · 8d76a07
1 parent 9aa83c2
commit 8d76a07
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 40 deletions.
diff --git a/examples/after-window-onload.html b/examples/after-window-onload.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="assets/log.js"></script>
+    <script src="assets/loadjs/loadjs.js"></script>
+    <script>
+      // load a file after window onload event fires
+      window.addEventListener('load', function(ev) {
+        loadjs('assets/file1.js', function() {
+          log('file1.js loaded');
+        });
+      });
+    </script>
+  </head>
+  <body>
+    <h1>Example: Load script after window onload event fires</h1>
+  </body>
+</html>
diff --git a/examples/assets/loadjs/loadjs.js b/examples/assets/loadjs/loadjs.js
@@ -152,15 +152,13 @@
     }
 
     // load scripts
-    win.setTimeout(function() {
-      loadScripts(paths, function(pathsNotFound) {
-        if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
-        else (successFn || devnull)();
-
-        // publish bundle load event
-        publish(bundleId, pathsNotFound);
-      });
-    }, 0);  // fires after window 'load' event
+    loadScripts(paths, function(pathsNotFound) {
+      if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
+      else (successFn || devnull)();
+
+      // publish bundle load event
+      publish(bundleId, pathsNotFound);
+    });
   }
 
 

diff --git a/examples/assets/loadjs/loadjs.min.js b/examples/assets/loadjs/loadjs.min.js
diff --git a/examples/assets/log.js b/examples/assets/log.js
@@ -0,0 +1,20 @@
+// define global logging function
+function log(msg) {
+  var d = new Date(), ts;
+  ts = d.toLocaleTimeString().split(' ');
+  ts = ts[0] + '.' + d.getMilliseconds() + ' ' + ts[1];
+
+  console.log('[' + ts + '] ' + msg);
+}
+
+
+// log DOMContentLoaded event
+document.addEventListener('DOMContentLoaded', function(ev) {
+  log('DOMContentLoaded fired');
+});
+
+
+// log window onload event
+window.addEventListener('load', function(ev) {
+  log('window load event fired');
+});
diff --git a/examples/before-domcontentloaded.html b/examples/before-domcontentloaded.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="assets/log.js"></script>
+    <script src="assets/file1.js"></script>
+  </head>
+  <body>
+    <h1>Example: Load script before DOMContentLoaded event fires</h1>
+  </body>
+</html>
diff --git a/examples/before-window-onload.html b/examples/before-window-onload.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html>
+  <head>
+    <script src="assets/log.js"></script>
+    <script src="assets/loadjs/loadjs.js"></script>
+    <script>
+      loadjs('assets/file1.js', function() {
+        log('file1.js loaded');
+      });      
+    </script>
+  </head>
+  <body>
+    <h1>Example: Load script after DOMContentLoaded event fires but before window onload event</h1>
+  </body>
+</html>
diff --git a/examples/index.html → examples/examples.html b/examples/index.html → examples/examples.html
@@ -1,18 +1,9 @@
 <!doctype html>
 <html>
   <head>
+    <script src="assets/log.js"></script>
     <script src="assets/loadjs/loadjs.js"></script>
     <script>
-      // define global logging function
-      function log(msg) {
-        var d = new Date(), ts;
-        ts = d.toLocaleTimeString().split(' ');
-        ts = ts[0] + '.' + d.getMilliseconds() + ' ' + ts[1];
-
-        console.log('[' + ts + '] ' + msg);
-      }
-
-
       // load a single file
       loadjs('assets/file1.js', function() {
         log('example1: file1.js loaded');

diff --git a/src/loadjs.js b/src/loadjs.js
@@ -152,15 +152,13 @@
     }
 
     // load scripts
-    win.setTimeout(function() {
-      loadScripts(paths, function(pathsNotFound) {
-        if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
-        else (successFn || devnull)();
-
-        // publish bundle load event
-        publish(bundleId, pathsNotFound);
-      });
-    }, 0);  // fires after window 'load' event
+    loadScripts(paths, function(pathsNotFound) {
+      if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
+      else (successFn || devnull)();
+
+      // publish bundle load event
+      publish(bundleId, pathsNotFound);
+    });
   }
 
 

diff --git a/test/assets/loadjs/loadjs.js b/test/assets/loadjs/loadjs.js
@@ -151,16 +151,14 @@
       }
     }
 
-    // load scripts
-    win.setTimeout(function() {
-      loadScripts(paths, function(pathsNotFound) {
-        if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
-        else (successFn || devnull)();
-
-        // publish bundle load event
-        publish(bundleId, pathsNotFound);
-      });
-    }, 0);  // fires after window 'load' event
+    // start downloads
+    loadScripts(paths, function(pathsNotFound) {
+      if (pathsNotFound.length) (failFn || devnull)(pathsNotFound);
+      else (successFn || devnull)();
+
+      // publish bundle load event
+      publish(bundleId, pathsNotFound);
+    });
   }
 
 

diff --git a/test/assets/loadjs/loadjs.min.js b/test/assets/loadjs/loadjs.min.js