Changeset 264 for lang/javascript/misc/loader.js.inc

Timestamp:

09/23/07 20:48:05 (16 months ago)

Author:

holidays-l

Message:

lang/javascript/misc/loader.js.inc: Fixed something.
lang/javascript/misc/loader-min.js.inc: Fixed something.

Files:

• lang/javascript/misc/loader.js.inc (modified) (3 diffs)

lang/javascript/misc/loader.js.inc

@@ -1 +1 @@
 (function(entries) {
-    function isString(obj) {
-        return (typeof obj == 'string' || obj instanceof String);
+    function defined(prop) {
+        try{
+            return eval('typeof ' + prop) != "undefined";
+        } catch(e) {
+        }
+        return false;
     }
 
-    function hasLoaded(prop) {
-        try{
-            return eval(prop + '.toString');
-        } catch(e) {
-        }
-    }
-
-    function load(src) {
+    function loadScript(src) {
         var script = document.createElement('script');
         script.type = 'text/javascript';
-        script.charset = 'UTF-8';
         script.src = src;
         (document.body || document.documentElement).appendChild(script);
@@ -20 +16 @@
 
     var onComplete;
-    (function doEntry() {
+    (function doNextEntry() {
         var entry = entries.shift();
         if (!entry) {
-            if (onComplete) {
-                onComplete();
-            }
-            return;
+            return onComplete && onComplete();
         }
 
-        if (isString(entry)) {
-            load(entry);
-            doEntry();
-            return;
+        if (typeof entry == 'string' || entry instanceof String) {
+            entry = {'window':entry};
         }
-
         for (var prop in entry) {
-            if (!hasLoaded(prop)) {
-                load(entry[prop]);
+            if (prop == 'window' || !defined(prop)) {
+                loadScript(entry[prop]);
             }
         }
         var timer = setInterval(function() {
             for (var prop in entry) {
-                if (!hasLoaded(prop)) {
+                if (!defined(prop)) {
                     return;
                 }
             }
             clearInterval(timer);
-            doEntry();
+            doNextEntry();
         }, 99);
     })();
@@ -55 +45 @@
             var args = arguments;
             onComplete = function() {
-                callback.apply(null, args);
+                callback.apply(callback, args);
             };
         }