Ticket #4573: dojo.2.patch

io/script.js

@@ -56 +56 @@
                 var dfd = dojo._ioSetArgs(args, this._deferredCancel, this._deferredOk, this._deferredError);
 
                 var ioArgs = dfd.ioArgs;
-                ioArgs.id = "dojoIoScript" + (this._counter++);
+                ioArgs.id = dojo._scopeName + "IoScript" + (this._counter++);
                 ioArgs.canDelete = false;
 
                 //Special setup for jsonp case

io/iframe.js

@@ -128 +128 @@
                 //              using dojo.objectToQuery().
 
                 if(!this["_frame"]){
-                        this._frame = this.create(this._iframeName, "dojo.io.iframe._iframeOnload();");
+                        this._frame = this.create(this._iframeName, dojo._scopeName + ".io.iframe._iframeOnload();");
                 }
 
                 //Set up the deferred.
@@ -212 +212 @@
 
         _currentDfd: null,
         _dfdQueue: [],
-        _iframeName: "dojoIoIframe",
+        _iframeName: dojo._scopeName + "IoIframe",
 
         _fireNextRequest: function(){
                 //summary: Internal method used to fire the next request in the bind queue.

parser.js

@@ -122 +122 @@
                 //              potentially calls a layout method to allow them to connect with
                 //              any children            
                 var thelist = [];
+                var daName = dojo._scopeName + "Type";
                 d.forEach(nodes, function(node){
                         if(!node){ return; }
-                        var type = node.getAttribute("dojoType");
+                        var type = node.getAttribute(daName);
                         if((!type)||(!type.length)){ return; }
                         var clsInfo = getClassInfo(type);
                         var clazz = clsInfo.cls;
@@ -219 +220 @@
                 //              Search specified node (or root node) recursively for class instances,
                 //              and instantiate them Searches for
                 //              dojoType="qualified.class.name"
-                var list = d.query('[dojoType]', rootNode);
+                var list = d.query('[' + dojo._scopeName + 'Type]', rootNode);
                 // go build the object instances
                 var instances = this.instantiate(list);
                 return instances;

_base/_loader/loader.js

@@ -112 +112 @@
         if(!contents){ return false; } // Boolean
         this._loadedUrls[uri] = true;
         this._loadedUrls.push(uri);
-        if(cb){ contents = '('+contents+')'; }
+        if(cb){
+                contents = '('+contents+')';
+        }else{
+                //Only do the scoping if no callback. If a callback is specified,
+                //it is most likely the i18n bundle stuff.
+                contents = this._scopePrefix + contents + this._scopeSuffix;
+        }
         var value = dojo["eval"](contents+"\r\n//@ sourceURL="+uri);
         if(cb){ cb(value); }
         return true; // Boolean
@@ -223 +229 @@
         //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" || (djConfig["useXDomain"] && dojo.isOpera)){
-                setTimeout("dojo.loaded();", 0);
+                setTimeout(dojo._scopeName + ".loaded();", 0);
         }else{
                 dojo.loaded();
         }

_base/_loader/hostenv_browser.js

@@ -238 +238 @@
                         //      strips all comments -- including conditional ones.
 
                         document.write('<scr'+'ipt defer src="//:" '
-                                + 'onreadystatechange="if(this.readyState==\'complete\'){dojo._loadInit();}">'
+                                + 'onreadystatechange="if(this.readyState==\'complete\'){' + dojo._scopeName + '._loadInit();}">'
                                 + '</scr'+'ipt>'
                         );
 

_base/_loader/loader_debug.js

@@ -12 +12 @@
                 //Set a timeout so the module can be executed into existence. Normally the
                 //dojo.provide call in a module is the first line. Don't want to risk attaching
                 //another script tag until the current one finishes executing.
-                window.setTimeout("dojo._xdDebugFileLoaded('" + resourceName + "')", 1);
+                window.setTimeout(dojo._scopeName + "._xdDebugFileLoaded('" + resourceName + "')", 1);
         }
 
         return dojo.nonDebugProvide.apply(dojo, arguments);

_base/_loader/bootstrap.js

@@ -41 +41 @@
 
         //TODOC:  HOW TO DOC THIS?
         // dojo is the root variable of (almost all) our public symbols -- make sure it is defined.
-        if(typeof this["dojo"] == "undefined"){
-                this.dojo = {};
+        if(typeof(dojo) == "undefined"){
+                this.dojo = {
+                        _scopeName: "dojo",
+                        _scopePrefix: "",
+                        _scopePrefixArgs: "",
+                        _scopeSuffix: "",
+                        _scopeMap: {}
+                };
         }
 
+        //Need placeholders for dijit and dojox for scoping code.
+        if(typeof(dijit) == "undefined"){
+                this.dijit = {_scopeName: "dijit"};
+        }
+        if(typeof(dojox) == "undefined"){
+                this.dojox = {_scopeName: "dojox"};
+        }
+
+        if(!dojo._scopeArgs){
+                dojo._scopeArgs = [dojo, dijit, dojox];
+        }
+
         // summary:
         //              return the current global context object
         //              (e.g., the window object in a browser).
@@ -91 +109 @@
 
 // Register with the OpenAjax hub
 if(typeof OpenAjax != "undefined"){
-        OpenAjax.hub.registerLibrary("dojo", "http://dojotoolkit.org", dojo.version.toString());
+        OpenAjax.hub.registerLibrary(dojo._scopeName, "http://dojotoolkit.org", dojo.version.toString());
 }
 
 dojo._getProp = function(/*Array*/parts, /*Boolean*/create, /*Object*/context){
         var obj=context||dojo.global;
         for(var i=0, p; obj&&(p=parts[i]); i++){
+                if(i == 0 && this._scopeMap[p]){
+                        p = this._scopeMap[p];
+                }
                 obj = (p in obj ? obj[p] : (create ? obj[p]={} : undefined));
         }
         return obj; // Any

_base/_loader/loader_xd.js

@@ -45 +45 @@
 
         //Create resource object and the call to _xdResourceLoaded.
         var output = [];
-        output.push("dojo._xdResourceLoaded({\n");
+        output.push(dojo._scopeName + "._xdResourceLoaded({\n");
 
         //Add dependencies
         if(deps.length > 0){
@@ -60 +60 @@
         }
 
         //Add the contents of the file inside a function.
-        //Pass in dojo as an argument to the function to help with
-        //allowing multiple versions of dojo in a page.
-        output.push("\ndefineResource: function(dojo){");
+        //Pass in scope arguments so we can support multiple versions of the
+        //same module on a page.
+        output.push("\ndefineResource: function(" + dojo._scopePrefixArgs + "){");
         
         //Don't put in the contents in the debugAtAllCosts case
         //since the contents may have syntax errors. Let those
@@ -168 +168 @@
 
                 //Start timer
                 if(!this._xdTimer){
-                        this._xdTimer = setInterval("dojo._xdWatchInFlight();", 100);
+                        this._xdTimer = setInterval(dojo._scopeName + "._xdWatchInFlight();", 100);
                 }
                 this._xdStartTime = (new Date()).getTime();
         }
@@ -213 +213 @@
                         var res = this._xdCreateResource(contents, module, uri);
                         dojo.eval(res);
                 }else{
-                        if(cb){ contents = '('+contents+')'; }
-                        var value = dojo.eval(contents);
                         if(cb){
+                                contents = '('+contents+')';
+                        }else{
+                                //Only do the scoping if no callback. If a callback is specified,
+                                //it is most likely the i18n bundle stuff.
+                                contents = this._scopePrefix + contents + this._scopeSuffix;
+                        }
+                        var value = dojo["eval"](contents+"\r\n//@ sourceURL="+uri);
+                        if(cb){
                                 cb(value);
                         }
                 }
@@ -593 +599 @@
                         this._xdDebugQueue.push({resourceName: content.resourceName, resourcePath: content.resourcePath});
                 }else{
                         //Evaluate the resource to bring it into being.
-                        //Pass dojo in so that later, to support multiple versions of dojo
-                        //in a page, we can pass which version of dojo to use.  
-                        content(dojo);
+                        //Pass in scope args to allow multiple versions of modules in a page.   
+                        content.apply(dojo.global, dojo._scopeArgs);
                 }
         }
 
@@ -603 +608 @@
         //This normally shouldn't happen with proper dojo.provide and dojo.require
         //usage, but providing it just in case. Note that these may not be executed
         //in the original order that the developer intended.
-        //Pass dojo in so that later, to support multiple versions of dojo
-        //in a page, we can pass which version of dojo to use.
         for(var i = 0; i < this._xdContents.length; i++){
                 var current = this._xdContents[i];
                 if(current.content && !current.isDefined){
-                        current.content(dojo);
+                        //Pass in scope args to allow multiple versions of modules in a page.   
+                        current.content.apply(dojo.global, dojo._scopeArgs);
                 }
         }