Changeset 13145

Timestamp:

03/19/08 06:04:23 (10 months ago)

Author:

alex

Message:

updating code and docs to enable the addOnLoad(obj, function(){}); style which other dojo APIs handle. Some work to reduce code size as well. Fixes #5404

Location:

dojo/trunk

Files:

• tests/_base/_loader/addLoadEvents.html (modified) (1 diff)
• _base/_loader/loader.js (modified) (5 diffs)

dojo/trunk/tests/_base/_loader/addLoadEvents.html

@@ -8 +8 @@
                 <script type="text/javascript">
                         dojo.addOnLoad(function(){
-                                alert("addOnLoad works");
+                                console.debug("addOnLoad(func) works");
                         });
+                        var scope = {
+                                named: function(){ console.debug("addOnLoad(obj, name) works"); },
+                                refd: function(){ console.debug("addOnLoad(obj, func) works"); }
+                        };
+                        dojo.addOnLoad(scope, "named");
+                        dojo.addOnLoad(scope, scope.refd);
+                        // dojo.addOnLoad(scope, "named");
+                        // dojo.addOnLoad(scope, scope.refd);
+
                         dojo.addOnUnload(function(){
                                 alert("addOnUnload works");

dojo/trunk/_base/_loader/loader.js

@@ -146 +146 @@
                                 mll[x]();
                         }catch(e){
+                                throw e;
                                 console.error("dojo.addOnLoad callback failed: " + e, e); /* let other load events fire, like the parser, but report the error */
                         }
@@ -168 +169 @@
                 while(mll.length){
                         (mll.pop())();
+                }
+        }
+
+        var onto = function(arr, obj, fn){
+                if(!fn){
+                        arr.push(obj);
+                }else if(fn){
+                        var func = (typeof fn == "string") ? obj[fn] : fn;
+                        arr.push(function(){ func.call(obj); });
                 }
         }
@@ -182 +192 @@
                 //      |       dojo.addOnLoad(functionPointer);
                 //      |       dojo.addOnLoad(object, "functionName");
-                if(arguments.length == 1){
-                        d._loaders.push(obj);
-                }else if(arguments.length > 1){
-                        d._loaders.push(function(){
-                                obj[functionName]();
-                        });
-                }
+                //      |       dojo.addOnLoad(object, function(){ /* ... */});
+
+                onto(d._loaders, obj, functionName);
 
                 //Added for xdomain loading. dojo.addOnLoad is used to
@@ -200 +206 @@
 
         dojo.addOnUnload = function(/*Object?*/obj, /*String|Function?*/functionName){
-                // summary: registers a function to be triggered when the page unloads
+                // summary:
+                //              registers a function to be triggered when the page unloads
                 // example:
                 //      |       dojo.addOnUnload(functionPointer)
                 //      |       dojo.addOnUnload(object, "functionName")
-                if(arguments.length == 1){
-                        d._unloaders.push(obj);
-                }else if(arguments.length > 1){
-                        d._unloaders.push(function(){
-                                obj[functionName]();
-                        });
-                }
+                //      |       dojo.addOnUnload(object, function(){ /* ... */});
+
+                onto(d._unloaders, obj, functionName);
         }
 
@@ -223 +226 @@
 
         dojo._callLoaded = function(){
-                //The "object" check is for IE, and the other opera check fixes an issue
-                //in Opera where it could not find the body element in some widget test cases.
-                //For 0.9, maybe route all browsers through the setTimeout (need protection
-                //still for non-browser environments though). This might also help the issue with
-                //FF 2.0 and freezing issues where we try to do sync xhr while background css images
-                //are being loaded (trac #2572)? Consider for 0.9.
+
+                // The "object" check is for IE, and the other opera check fixes an
+                // issue in Opera where it could not find the body element in some
+                // widget test cases.  For 0.9, maybe route all browsers through the
+                // setTimeout (need protection still for non-browser environments
+                // though). This might also help the issue with FF 2.0 and freezing
+                // issues where we try to do sync xhr while background css images are
+                // being loaded (trac #2572)? Consider for 0.9.
                 if(typeof setTimeout == "object" || (dojo.config.useXDomain && d.isOpera)){
                         if(dojo.isAIR){