Changeset 7792

Timestamp:

03/26/07 02:49:40 (22 months ago)

Author:

alex

Message:

enable the djConfig attribute on <script> tags that pull in Dojo. Simplifies setting config options. Refs #2500

Files:

• dojo/trunk/_base/_loader/hostenv_browser.js (modified) (1 diff)

dojo/trunk/_base/_loader/hostenv_browser.js

@@ -10 +10 @@
                 // the URL we were loaded from here.
 
-                // before we get any further with the config options, try to pick them out
-                // of the URL. Most of this code is from NW
-                if(
-                        (!djConfig["baseUrl"]) && (document && document.getElementsByTagName)
-                ){
+                // grab the node we were loaded from
+                if(document && document.getElementsByTagName){
                         var scripts = document.getElementsByTagName("script");
-                        var rePkg = /(dojo|bootstrap)\.js([\?\.]|$)/i;
-                        for(var i = 0; i < scripts.length; i++) {
+                        var rePkg = /dojo\.js([\?\.]|$)/i;
+                        for(var i = 0; i < scripts.length; i++){
                                 var src = scripts[i].getAttribute("src");
-                                if(!src) { continue; }
+                                if(!src){ continue; }
                                 var m = src.match(rePkg);
-                                if(m) {
-                                        var root = src.substring(0, m.index);
-                                        if(src.indexOf("bootstrap") > -1) { root += "../"; }
-                                        d._baseUrl = root;
-                                        console.debug(root);
-                                        break;
+                                if(m){
+                                        // find out where we came from
+                                        if(!djConfig["baseUrl"]){
+                                                djConfig["baseUrl"] = src.substring(0, m.index);
+                                        }
+                                        // and find out if we need to modify our behavior
+                                        var cfg = scripts[i].getAttribute("djConfig");
+                                        if(cfg){
+                                                var cfgo = eval("({ "+cfg+" })");
+                                                for(var x in cfgo){
+                                                        djConfig[x] = cfgo[x];
+                                                }
+                                        }
+                                        break; // "first Dojo wins"
                                 }
                         }
-                }else{
-                        d._baseUrl = djConfig["baseUrl"];
-                }
+                }
+                d._baseUrl = djConfig["baseUrl"];
 
                 // fill in the rendering support information in dojo.render.*