Changeset 7650

Timestamp:

03/18/07 17:12:40 (22 months ago)

Author:

alex

Message:

fixes onload code, removes TONS of cruft, and slims the built (browser) bootstrap loader to 11K from 21K. Refs #2500

Location:

dojo/trunk

Files:

• dojo.js (modified) (4 diffs)
• tests/runner.js (modified) (1 diff)
• tests/_base.js (modified) (1 diff)
• tests/_browserRunner.js (modified) (1 diff)
• _base/_loader/bootstrap.js (modified) (1 diff)
• _base/_loader/hostenv_browser.js (modified) (18 diffs)
• _base/_loader/loader.js (modified) (11 diffs)

dojo/trunk/dojo.js

@@ -29 +29 @@
                 }
         
-                if((this["djConfig"])&&(djConfig["baseScriptUri"])){
-                        var root = djConfig["baseScriptUri"];
-                }else if((this["djConfig"])&&(djConfig["baseRelativePath"])){
-                        var root = djConfig["baseRelativePath"];
+                if((this["djConfig"])&&(djConfig["baseUrl"])){
+                        var root = djConfig["baseUrl"];
                 }else{
                         var root = "./";
@@ -40 +38 @@
                         }
                         if(!this["djConfig"]){
-                                djConfig = { baseRelativePath: root };
+                                djConfig = { baseUrl: root };
                         }
         
@@ -54 +52 @@
                                                 root = src.substring(0, m.index);
                                                 if(!this["djConfig"]){ djConfig = {}; }
-                                                djConfig["baseScriptUri"] = djConfig["baseRelativePath"] = root;
+                                                djConfig["baseUrl"] = root;
                                                 break;
                                         }
@@ -61 +59 @@
                 }
         
-                var loaderRoot = root;
-                if((this["djConfig"])&&(djConfig["baseLoaderUri"])){
-                        loaderRoot = djConfig["baseLoaderUri"];
-                }
-        
                 for(var x=0; x < tmps.length; x++){
-                        var spath = loaderRoot+"_base/_loader/"+tmps[x];
+                        var spath = root+"_base/_loader/"+tmps[x];
                         if(isRhino||isSpidermonkey){
                                 load(spath);

dojo/trunk/tests/runner.js

@@ -663 +663 @@
 
 if(this["dojo"]){
-        dojo.kwCompoundRequire({
+        dojo.platformRequire({
                 browser: ["tests._browserRunner"],
                 rhino: ["tests._rhinoRunner"],

dojo/trunk/tests/_base.js

@@ -1 @@
-if(this["dojo"]){
+try{
         dojo.provide("tests._base");
-}
+}catch(e){}
 
 // the test suite for the bootstrap. Requires hostenv and other base tests at

dojo/trunk/tests/_browserRunner.js

@@ -1 @@
-if(this["dojo"]){
+if(window["dojo"]){
         dojo.provide("tests._browserRunner");
 }

dojo/trunk/_base/_loader/bootstrap.js

@@ -6 +6 @@
 // description:  The variables that can be set are as follows:
 //                      - isDebug: false
-//                      - allowQueryConfig: false
 //                      - baseScriptUri: ""
 //                      - baseRelativePath: ""

dojo/trunk/_base/_loader/hostenv_browser.js

@@ -1 +1 @@
 if(typeof window != 'undefined'){
+        dojo.isBrowser = true;
+        dojo._name = "browser";
 
         // attempt to figure out the path to dojo if it isn't set in the config
         (function(){
+                var d = dojo;
+                // this is a scope protection closure. We set browser versions and grab
+                // 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.allowQueryConfig){
-                        var baseUrl = document.location.toString(); // FIXME: use location.query instead?
-                        var params = baseUrl.split("?", 2);
-                        if(params.length > 1){
-                                var paramStr = params[1];
-                                var pairs = paramStr.split("&");
-                                for(var x in pairs){
-                                        var sp = pairs[x].split("=");
-                                        // FIXME: is this eval dangerous?
-                                        if((sp[0].length > 9)&&(sp[0].substr(0, 9) == "djConfig.")){
-                                                var opt = sp[0].substr(9);
-                                                try{
-                                                        djConfig[opt]=eval(sp[1]);
-                                                }catch(e){
-                                                        djConfig[opt]=sp[1];
-                                                }
-                                        }
-                                }
-                        }
-                }
-
                 if(
-                        ((djConfig["baseScriptUri"] == "")||(djConfig["baseRelativePath"] == "")) && 
-                        (document && document.getElementsByTagName)
+                        (djConfig["baseUrl"] == "") && (document && document.getElementsByTagName)
                 ){
                         var scripts = document.getElementsByTagName("script");
-                        var rePkg = /(__package__|dojo|bootstrap1)\.js([\?\.]|$)/i;
+                        var rePkg = /(dojo|bootstrap)\.js([\?\.]|$)/i;
                         for(var i = 0; i < scripts.length; i++) {
                                 var src = scripts[i].getAttribute("src");
@@ -38 +22 @@
                                 if(m) {
                                         var root = src.substring(0, m.index);
-                                        if(src.indexOf("bootstrap1") > -1) { root += "../"; }
-                                        if(!this["djConfig"]) { djConfig = {}; }
-                                        if(djConfig["baseScriptUri"] == "") { djConfig["baseScriptUri"] = root; }
-                                        if(djConfig["baseRelativePath"] == "") { djConfig["baseRelativePath"] = root; }
+                                        if(src.indexOf("bootstrap") > -1) { root += "../"; }
+                                        d._baseUrl = root;
+                                        console.debug(root);
                                         break;
                                 }
                         }
+                }else{
+                        d._baseUrl = djConfig["baseUrl"];
                 }
 
                 // fill in the rendering support information in dojo.render.*
-                var dr = dojo.render;
-                var drh = dojo.render.html;
-                var drs = dojo.render.svg;
-                var dua = (drh.UA = navigator.userAgent);
-                var dav = (drh.AV = navigator.appVersion);
-                var t = true;
-                var f = false;
-                drh.capable = t;
-                drh.support.builtin = t;
-
-                dr.ver = parseFloat(drh.AV);
-                dr.os.mac = dav.indexOf("Macintosh") >= 0;
-                dr.os.win = dav.indexOf("Windows") >= 0;
-                // could also be Solaris or something, but it's the same browser
-                dr.os.linux = dav.indexOf("X11") >= 0;
-
-                drh.opera = dua.indexOf("Opera") >= 0;
-                drh.khtml = (dav.indexOf("Konqueror") >= 0)||(dav.indexOf("Safari") >= 0);
-                drh.safari = dav.indexOf("Safari") >= 0;
+                var n = navigator;
+                var dua = n.userAgent;
+                var dav = n.appVersion;
+                var tv = parseFloat(dav);
+
+                d.isOpera = (dua.indexOf("Opera") >= 0) ? tv : 0;
+                d.isKhtml = (dav.indexOf("Konqueror") >= 0)||(dav.indexOf("Safari") >= 0) ? tv : 0;
+                d.isSafari = (dav.indexOf("Safari") >= 0) ? tv : 0;
                 var geckoPos = dua.indexOf("Gecko");
-                drh.mozilla = drh.moz = (geckoPos >= 0)&&(!drh.khtml);
-                if (drh.mozilla) {
-                        // gecko version is YYYYMMDD
-                        drh.geckoVersion = dua.substring(geckoPos + 6, geckoPos + 14);
-                }
-                drh.ie = (document.all)&&(!drh.opera);
-                drh.ie50 = drh.ie && dav.indexOf("MSIE 5.0")>=0;
-                drh.ie55 = drh.ie && dav.indexOf("MSIE 5.5")>=0;
-                drh.ie60 = drh.ie && dav.indexOf("MSIE 6.0")>=0;
-                drh.ie70 = drh.ie && dav.indexOf("MSIE 7.0")>=0;
+                d.isMozilla = d.isMoz = ((geckoPos >= 0)&&(!d.isKhtml)) ? tv : 0;
+                d.isIE = ((document.all)&&(!d.isOpera)) ? tv : 0;
 
                 var cm = document["compatMode"];
-                drh.quirks = (cm == "BackCompat")||(cm == "QuirksMode")||drh.ie55||drh.ie50;
+                d.isQuirks = (cm == "BackCompat")||(cm == "QuirksMode")||(d.isIE < 6);
 
                 // TODO: is the HTML LANG attribute relevant?
-                dojo.locale = dojo.locale || (drh.ie ? navigator.userLanguage : navigator.language).toLowerCase();
-
-                dr.vml.capable=drh.ie;
-                drs.capable = f;
-                drs.support.plugin = f;
-                drs.support.builtin = f;
-                var tdoc = window["document"];
-                var tdi = tdoc["implementation"];
-
-                if((tdi)&&(tdi["hasFeature"])&&(tdi.hasFeature("org.w3c.dom.svg", "1.0"))){
-                        drs.capable = t;
-                        drs.support.builtin = t;
-                        drs.support.plugin = f;
-                }
-                // webkits after 420 support SVG natively. The test string is "AppleWebKit/420+"
-                if(drh.safari){
-                        var tmp = dua.split("AppleWebKit/")[1];
-                        var ver = parseFloat(tmp.split(" ")[0]);
-                        if(ver >= 420){
-                                drs.capable = t;
-                                drs.support.builtin = t;
-                                drs.support.plugin = f;
-                        }
-                }else{
-                }
+                d.locale = d.locale || (d.isIE ? n.userLanguage : n.language).toLowerCase();
         })();
 
-        dojo.hostenv.startPackage("dojo.hostenv");
-
-        dojo.render.name = dojo.hostenv.name_ = 'browser';
-        dojo.hostenv.searchIds = [];
 
         // These are in order of decreasing likelihood; this will change in time.
-        dojo.hostenv._XMLHTTP_PROGIDS = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
-
-        dojo.hostenv.getXmlhttpObject = function(){
-                // summary: does the work of portably generating a new XMLHTTPRequest object.
+        dojo._XMLHTTP_PROGIDS = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
+
+        dojo._xhrObj= function(){
+                // summary: 
+                //              does the work of portably generating a new XMLHTTPRequest
+                //              object.
                 var http = null;
                 var last_e = null;
@@ -125 +65 @@
                 if(!http){
                         for(var i=0; i<3; ++i){
-                                var progid = dojo.hostenv._XMLHTTP_PROGIDS[i];
+                                var progid = dojo._XMLHTTP_PROGIDS[i];
                                 try{
                                         http = new ActiveXObject(progid);
@@ -133 +73 @@
 
                                 if(http){
-                                        dojo.hostenv._XMLHTTP_PROGIDS = [progid];  // so faster next time
+                                        dojo._XMLHTTP_PROGIDS = [progid];  // so faster next time
                                         break;
                                 }
@@ -144 +84 @@
 
                 if(!http){
-                        return dojo.raise("XMLHTTP not available", last_e);
+                        throw new Error("XMLHTTP not available: "+last_e);
                 }
 
@@ -150 +90 @@
         }
 
-        dojo.hostenv._blockAsync = false;
-        dojo.hostenv.getText = function(uri, async_cb, fail_ok){
+        dojo._blockAsync = false;
+        dojo._getText = function(uri, async_cb, fail_ok){
                 // summary: Read the contents of the specified uri and return those contents.
                 // uri:
@@ -168 +108 @@
                 // of an async callback might call another sync XHR, this hangs khtml forever
                 // hostenv._blockAsync must also be checked in BrowserIO's watchInFlight()
-                // NOTE: must be declared before scope switches ie. this.getXmlhttpObject()
+                // NOTE: must be declared before scope switches ie. this._xhrObj()
                 if(!async_cb){ this._blockAsync = true; }
 
-                var http = this.getXmlhttpObject();
+                var http = this._xhrObj();
 
                 function isDocumentOk(http){
                         var stat = http["status"];
-                        // allow a 304 use cache, needed in konq (is this compliant with the http spec?)
+                        // allow a 304 use cache, needed in konq (is this compliant with
+                        // the http spec?)
                         return Boolean((!stat)||((200 <= stat)&&(300 > stat))||(stat==304));
                 }
@@ -181 +122 @@
                 if(async_cb){
                         var _this = this, timer = null, gbl = dojo.global();
-                        var xhr = dojo.getObject("dojo.io.XMLHTTPTransport");
                         http.onreadystatechange = function(){
                                 if(timer){ gbl.clearTimeout(timer); timer = null; }
-                                if(_this._blockAsync || (xhr && xhr._blockAsync)){
-                                        timer = gbl.setTimeout(function () { http.onreadystatechange.apply(this); }, 10);
+                                if(_this._blockAsync){
+                                        timer = gbl.setTimeout(function(){
+                                                http.onreadystatechange.apply(this);
+                                        }, 10);
                                 }else{
                                         if(4==http.readyState){
@@ -222 +164 @@
         }
 
-        dojo.hostenv.defaultDebugContainerId = 'dojoDebug';
-        dojo.hostenv._println_buffer = [];
-        dojo.hostenv._println_safe = false;
-        dojo.hostenv.println = function(/*String*/line){
-                // summary:
-                //              prints the provided line to whatever logging container is
-                //              available. If the page isn't loaded yet, the line may be added
-                //              to a buffer for printing later.
-                if(!dojo.hostenv._println_safe){
-                        dojo.hostenv._println_buffer.push(line);
-                }else{
-                        try {
-                                var console = document.getElementById(djConfig.debugContainerId ?
-                                        djConfig.debugContainerId : dojo.hostenv.defaultDebugContainerId);
-                                if(!console) { console = dojo.body(); }
-
-                                var div = document.createElement("div");
-                                div.appendChild(document.createTextNode(line));
-                                console.appendChild(div);
-                        } catch (e) {
-                                try{
-                                        // safari needs the output wrapped in an element for some reason
-                                        document.write("<div>" + line + "</div>");
-                                }catch(e2){
-                                        window.status = line;
-                                }
-                        }
-                }
-        }
-
-        dojo.addOnLoad(function(){
-                dojo.hostenv._println_safe = true;
-                while(dojo.hostenv._println_buffer.length > 0){
-                        dojo.hostenv.println(dojo.hostenv._println_buffer.shift());
-                }
-        });
-
-        function dj_addNodeEvtHdlr(/*DomNode*/node, /*String*/evtName, /*Function*/fp){
+        dojo._println = console.debug;
+
+        dojo._handleNodeEvent = function(/*DomNode*/node, /*String*/evtName, /*Function*/fp){
                 // summary:
                 //              non-destructively adds the specified function to the node's
@@ -274 +181 @@
 
         //      BEGIN DOMContentLoaded, from Dean Edwards (http://dean.edwards.name/weblog/2006/06/again/)
-        function dj_load_init(e){
+        dojo._loadInit = function(e){
                 // allow multiple calls, only first one will take effect
                 // A bug in khtml calls events callbacks for document for event which isnt supported
@@ -286 +193 @@
                 }
 
-                var initFunc = function(){
-                        //perform initialization
-                        if(dojo.render.html.ie){
-                                dojo.hostenv.makeWidgets();
-                        }
-                };
-
-                if(dojo.hostenv.inFlightCount == 0){
-                        initFunc();
-                        dojo.hostenv.modulesLoaded();
-                }else{
-                        //This else case should be xdomain loading.
-                        //Make sure this is the first thing in the load listener array.
-                        //Part of the dojo.addOnLoad guarantee is that when the listeners are notified,
-                        //It means the DOM (or page) has loaded and that widgets have been parsed.
-                        dojo.hostenv.modulesLoadedListeners.unshift(initFunc);
+                if(dojo._inFlightCount == 0){
+                        dojo._modulesLoaded();
                 }
         }
@@ -312 +205 @@
                 //              DOMContentLoaded on that platform. For more information, see:
                 //              http://trac.dojotoolkit.org/ticket/1704
-                if(dojo.render.html.opera || (dojo.render.html.moz && (djConfig["enableMozDomContentLoaded"] === true))){
-                        document.addEventListener("DOMContentLoaded", dj_load_init, null);
+                if(dojo.isOpera|| (dojo.isMoz && (djConfig["enableMozDomContentLoaded"] === true))){
+                        document.addEventListener("DOMContentLoaded", dojo._loadInit, null);
                 }
 
                 //      mainly for Opera 8.5, won't be fired if DOMContentLoaded fired already.
                 //  also used for Mozilla because of trac #1640
-                window.addEventListener("load", dj_load_init, null);
-        }
-
-        //      for Internet Explorer. readyState will not be achieved on init call, but dojo doesn't need it
-        //      however, we'll include it because we don't know if there are other functions added that might.
-        //      Note that this has changed because the build process strips all comments--including conditional
-        //              ones.
-        if(dojo.render.html.ie && dojo.render.os.win){
+                window.addEventListener("load", dojo._loadInit, null);
+        }
+
+        //      for Internet Explorer. readyState will not be achieved on init call,
+        //      but dojo doesn't need it however, we'll include it because we don't
+        //      know if there are other functions added that might.  Note that this has
+        //      changed because the build process strips all comments -- including
+        //      conditional ones.
+        if(dojo.isIE){
                 document.write('<scr'+'ipt defer src="//:" '
-                        + 'onreadystatechange="if(this.readyState==\'complete\'){dj_load_init();}">'
+                        + 'onreadystatechange="if(this.readyState==\'complete\'){dojo._loadInit();}">'
                         + '</scr'+'ipt>'
                 );
         }
 
-        if (/(WebKit|khtml)/i.test(navigator.userAgent)) { // sniff
-                var _timer = setInterval(function() {
-                        if (/loaded|complete/.test(document.readyState)) {
-                                dj_load_init(); // call the onload handler
+        if(/(WebKit|khtml)/i.test(navigator.userAgent)){ // sniff
+                var _timer = setInterval(function(){
+                        if(/loaded|complete/.test(document.readyState)){
+                                dojo._loadInit(); // call the onload handler
                         }
                 }, 10);
@@ -345 +239 @@
         // following code fixes the problem
         // Reference: http://support.microsoft.com/default.aspx?scid=kb;en-us;199155
-        if(dojo.render.html.ie){
-                dj_addNodeEvtHdlr(window, "beforeunload", function(){
-                        dojo.hostenv._unloading = true;
+        if(dojo.isIE){
+                dojo._handleNodeEvent(window, "beforeunload", function(){
+                        dojo._unloading = true;
                         window.setTimeout(function() {
-                                dojo.hostenv._unloading = false;
+                                dojo._unloading = false;
                         }, 0);
                 });
         }
 
-        dj_addNodeEvtHdlr(window, "unload", function(){
-                if((!dojo.render.html.ie)||(dojo.render.html.ie && dojo.hostenv._unloading)){
-                        dojo.hostenv.unloaded();
+        dojo._handleNodeEvent(window, "unload", function(){
+                if((!dojo.isIE)||(dojo.isIE && dojo._unloading)){
+                        dojo.unloaded();
                 }
         });
 
-        dojo.hostenv.makeWidgets = function(){
-                // you can put searchIds in djConfig and dojo.hostenv at the moment
-                // we should probably eventually move to one or the other
-                var sids = [];
-                if(djConfig.searchIds && djConfig.searchIds.length > 0) {
-                        sids = sids.concat(djConfig.searchIds);
-                }
-                if(dojo.hostenv.searchIds && dojo.hostenv.searchIds.length > 0) {
-                        sids = sids.concat(dojo.hostenv.searchIds);
-                }
-
-                if((djConfig.parseWidgets)||(sids.length > 0)){
-                        if(dojo.getObject("dojo.widget.Parse")){
-                                // we must do this on a delay to avoid:
-                                //      http://www.shaftek.org/blog/archives/000212.html
-                                // (IE bug)
-                                        var parser = new dojo.xml.Parse();
-                                        if(sids.length > 0){
-                                                for(var x=0; x<sids.length; x++){
-                                                        var tmpNode = document.getElementById(sids[x]);
-                                                        if(!tmpNode){ continue; }
-                                                        var frag = parser.parseElement(tmpNode, null, true);
-                                                        dojo.widget.getParser().createComponents(frag);
-                                                }
-                                        }else if(djConfig.parseWidgets){
-                                                var frag  = parser.parseElement(dojo.body(), null, true);
-                                                dojo.widget.getParser().createComponents(frag);
-                                        }
-                        }
-                }
-        }
-
-        dojo.addOnLoad(function(){
-                if(!dojo.render.html.ie) {
-                        dojo.hostenv.makeWidgets();
-                }
-        });
-
         try{
-                if(dojo.render.html.ie){
+                if(dojo.isIE){
                         document.namespaces.add("v","urn:schemas-microsoft-com:vml");
                         document.createStyleSheet().addRule("v\\:*", "behavior:url(#default#VML)");
@@ -407 +263 @@
         // stub, over-ridden by debugging code. This will at least keep us from
         // breaking when it's not included
-        dojo.hostenv.writeIncludes = function(){}
+        dojo._writeIncludes = function(){}
 
         //TODOC:  HOW TO DOC THIS?
-        // @global: dj_currentDocument
+        // @global: dojo._currentDocument
         // summary:
-        //              Current document object. 'dj_currentDocument' can be modified for temporary context shifting.
+        //              Current document object. 'dojo._currentDocument' can be modified
+        //              for temporary context shifting.
         // description:
-        //    dojo.doc() returns dojo.currentDocument.
-        //              Refer to dojo.doc() rather than referring to 'window.document' to ensure your
-        //              code runs correctly in managed contexts.
-        if(!dj_undef("document", this)){
-                dj_currentDocument = this.document;
+        //    dojo.doc() returns dojo._currentDocument. Refer to dojo.doc() rather
+        //    than referring to 'window.document' to ensure your code runs
+        //    correctly in managed contexts.
+        if(this["document"]){
+                dojo._currentDocument = this.document;
         }
 
@@ -424 +281 @@