- more changes for ie

Author: ded

src/script.js

@@ -1,7 +1,7 @@
-!function (win, doc, timeout) {
+!function (win, doc) {
   var head = doc.getElementsByTagName('head')[0],
       list = {}, ids = {}, delay = {}, scripts = {},
-      s = 'string', f = false, push = 'push',
+      s = 'string', f = false, push = 'push', complete = /^c|loade/,
       domContentLoaded = 'DOMContentLoaded', readyState = 'readyState',
       addEventListener = 'addEventListener', onreadystatechange = 'onreadystatechange',
       faux = doc.createElement('script'),
@@ -17,15 +17,17 @@
     doc[readyState] = 'loading';
   }
 
+  function timeout(fn) {
+    setTimeout(fn, 0)
+  }
+
   function every(ar, fn, i) {
     for (i = 0, j = ar.length; i < j; ++i) if (!fn(ar[i])) return f
     return 1;
   }
 
   function each(ar, fn) {
-    every(ar, function (el) {
-      return !fn(el);
-    })
+    every(ar, function (el) { return !fn(el) })
   }
 
   function $script(paths, idOrDone, optDone) {
@@ -35,9 +37,11 @@
         done = idOrDoneIsDone ? idOrDone : optDone,
         id = idOrDoneIsDone ? paths.join('') : idOrDone,
         queue = paths.length
+
     function loopFn(item) {
       return item.call ? item() : list[item]
     }
+
     function callback() {
       if (!--queue) {
         list[id] = 1
@@ -47,6 +51,7 @@
         }
       }
     }
+
     timeout(function () {
       each(paths, function (path, p) {
         p = $script.path ? $script.path + path + '.js' : path
@@ -56,11 +61,24 @@
         }
         scripts[path] = 1
         ids[id] = id || f
-        // preload(p, function (el) {
         !$script.order ? create(p, callback) : preload(p, function (el) {
           if (async) return callback()
-          el && head.insertBefore(el, head.firstChild)
-          loadedPaths[p] = 1
+          loadedPaths[p] = el || 1
+          if (el) {
+            if (workingPaths[0] == p) {
+              head.insertBefore(el, head.firstChild)
+              timeout(function () {
+                callback()
+                workingPaths.shift()
+                while (loadedPaths[workingPaths[0]]) {
+                  head.insertBefore(loadedPaths[workingPaths[0]], head.firstChild)
+                  timeout(callback)
+                  workingPaths.shift()
+                }
+              })
+            }
+            return
+          }
           workingPaths[0] == p && create(p, callback)
           workingPaths.shift()
           while (loadedPaths[workingPaths[0]]) {
@@ -69,17 +87,16 @@
           }
         })
       })
-    }, 0)
+    })
     return $script
   }
 
   function create(path, fn, type) {
     var el = doc.createElement('script'), loaded = f
-    console.log('create("' + path + '")');
     el.type = type || 'text/javascript'
     el.async = !$script.order
     el.onload = el[onreadystatechange] = function () {
-      if ((el[readyState] && !(/^c|loade/.test(el[readyState]))) || loaded) return
+      if ((el[readyState] && !(complete.test(el[readyState]))) || loaded) return
       el.onload = el[onreadystatechange] = null
       loaded = 1
       fn && fn()
@@ -88,21 +105,29 @@
     head.insertBefore(el, head.firstChild)
   }
 
+  function bind(fn) {
+    var a = [].slice.call(aruments, 1)
+    return function () {
+      fn.apply(null, a)
+    }
+  }
+
   function preload(path, fn, el) {
-    el = doc.createElement('script')
     if (preloadReal) {
+      el = doc.createElement('script')
+      el.type = 'text/javascript'
       if (preloadExplicit) {
         el.preload = true
-        el.onpreload = function () {
-          fn(el)
-        }
+        el.onpreload = bind(fn,el)
       } else {
-        el[onreadystatechange] = function(){
-          el[readyState] == 'loaded' && fn(el)
-          el[onreadystatechange] = null
+        el[onreadystatechange] = function () {
+          if (complete.test(el[readyState])) {
+            fn(el)
+            el[onreadystatechange] = null
+          }
         }
       }
-      script.src = path
+      el.src = path
     } else if (async) {
       create(path, fn)
     } else {
@@ -134,8 +159,8 @@
     return this;
   };
 
-  (typeof module !== 'undefined' && module.exports) ?
-    (module.exports = $script) :
-    (win['$script'] = $script);
+  typeof module !== 'undefined' && module.exports && (module.exports = $script)
+
+  win['$script'] = $script
 
-}(this, document, setTimeout);
+}(this, document);