Ticket #6526: staticCallback.diff

script.js

@@ -74 +74 @@
                 var ioArgs = dfd.ioArgs;
                 ioArgs.id = dojo._scopeName + "IoScript" + (this._counter++);
                 ioArgs.canDelete = false;
-
+                var jsonpCallback = function(/*JSON Object*/json){
+                        //summary: 
+                        //              generic handler for jsonp callback. A pointer to this function
+                        //              is used for all jsonp callbacks.  NOTE: the "this" in this
+                        //              function will be the Deferred object that represents the script
+                        //              request.
+                        dfd.ioArgs.json = json;
+                };
                 //Special setup for jsonp case
                 if(args.callbackParamName){
                         //Add the jsonp parameter.
@@ -89 +96 @@
 
                         //Setup the Deferred to have the jsonp callback.
                         ioArgs.canDelete = true;
-                        dfd._jsonpCallback = this._jsonpCallback;
+                        dfd._jsonpCallback = jsonpCallback;
                         this["jsonp_" + ioArgs.id] = dfd;
+                } else if(args.staticCallback){ 
+                        // we use the static callback method, where the callback name is the URL of the resource
+                        // see http://www.json.com/2008/04/01/static-json-with-callback/
+                        var url = typeof args.staticCallback == 'string' ? 
+                                        args.staticCallback : new dojo._Url(location, ioArgs.url) + ''; // get the absolute url of the resource
+
+                        // we may want to use dojo.connect here so multiple requests can be made for the same resource
+                        dojo.global[url] = jsonpCallback;                       
                 }
                 return dfd; // dojo.Deferred
         },
@@ -196 +211 @@
                 }
         },
 
-        _jsonpCallback: function(/*JSON Object*/json){
-                //summary: 
-                //              generic handler for jsonp callback. A pointer to this function
-                //              is used for all jsonp callbacks.  NOTE: the "this" in this
-                //              function will be the Deferred object that represents the script
-                //              request.
-                this.ioArgs.json = json;
-        }
 }