Changeset 7961

Timestamp:

04/06/07 17:11:34 (21 months ago)

Author:

alex

Message:

removing async options for _getText. It was completely unused. Refs #2500

Location:

dojo/trunk/_base/_loader

Files:

• hostenv_browser.js (modified) (3 diffs)
• loader.js (modified) (1 diff)

dojo/trunk/_base/_loader/hostenv_browser.js

@@ -91 +91 @@
                                         }
                                 }
-
-                                /*if(http && !http.toString) {
-                                        http.toString = function() { "[object XMLHttpRequest]"; }
-                                }*/
                         }
 
@@ -111 +107 @@
                 }
 
-                d._blockAsync = false;
-                d._getText = function(uri, async_cb, fail_ok){
+                d._getText = function(uri, fail_ok){
                         // summary: Read the contents of the specified uri and return those contents.
                         // uri:
                         //              A relative or absolute uri. If absolute, it still must be in
                         //              the same "domain" as we are.
-                        // async_cb:
-                        //              If not specified, load synchronously. If specified, load
-                        //              asynchronously, and use async_cb as the progress handler which
-                        //              takes the xmlhttp object as its argument. If async_cb, this
-                        //              function returns null.
                         // fail_ok:
-                        //              Default false. If fail_ok and !async_cb and loading fails,
-                        //              return null instead of throwing.
-
-                        // need to block async callbacks from snatching this thread as the result
-                        // of an async callback might call another sync XHR, this hangs khtml forever
-                        // hostenv._blockAsync must also be checked in BrowserIO's watchInFlight()
+                        //              Default false. If fail_ok and loading fails, return null
+                        //              instead of throwing.
+
                         // NOTE: must be declared before scope switches ie. this._xhrObj()
-                        if(!async_cb){ this._blockAsync = true; }
-
                         var http = this._xhrObj();
 
-                        if(async_cb){
-                                var _this = this, timer = null, gbl = dojo.global();
-                                http.onreadystatechange = function(){
-                                        if(timer){ gbl.clearTimeout(timer); timer = null; }
-                                        if(_this._blockAsync){
-                                                timer = gbl.setTimeout(function(){
-                                                        http.onreadystatechange.apply(this);
-                                                }, 10);
-                                        }else{
-                                                if(4==http.readyState){
-                                                        if(isDocumentOk(http)){
-                                                                // console.debug("LOADED URI: "+uri);
-                                                                async_cb(http.responseText);
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-
-                        http.open('GET', uri, async_cb ? true : false);
+                        http.open('GET', uri, false);
                         try{
                                 http.send(null);
-                                if(async_cb){
-                                        return null;
-                                }
                                 if(!isDocumentOk(http)){
                                         var err = Error("Unable to load "+uri+" status:"+ http.status);
@@ -166 +129 @@
                                 }
                         }catch(e){
-                                this._blockAsync = false;
-                                if((fail_ok)&&(!async_cb)){
-                                        return null;
-                                }else{
-                                        throw e;
-                                }
-                        }
-
-                        this._blockAsync = false;
+                                if(fail_ok){ return null; }
+                                throw e;
+                        }
                         return http.responseText; // String
                 }

dojo/trunk/_base/_loader/loader.js

@@ -108 +108 @@
                 return true; // Boolean
         }
-        var contents = this._getText(uri, null, true);
+        var contents = this._getText(uri, true);
         if(!contents){ return false; } // Boolean
         this._loadedUrls[uri] = true;