Changeset 13356

Timestamp:

04/18/08 18:29:11 (7 months ago)

Author:

alex

Message:

ensure that DOH correctly loads _browserRunner.js when pages don't include Dojo. Fixes #6565. !strict

Files:

• util/trunk/doh/runner.js (modified) (5 diffs)

util/trunk/doh/runner.js

@@ -16 +16 @@
 
 doh.selfTest = false;
+
+doh.global = this;
 
 doh.hitch = function(/*Object*/thisObject, /*Function|String*/method /*, ...*/){
@@ -131 +133 @@
                 return function(){
                         try{
-                                cb.apply(scope||dojo.global||_this, arguments);
+                                cb.apply(scope||doh.global||_this, arguments);
                         }catch(e){
                                 _this.errback(e);
@@ -146 +148 @@
                                 return a[0];
                         }else if(typeof a[0] == "string"){
-                                return dojo.global[a[0]];
+                                return doh.global[a[0]];
                         }
                 }else if((a[0])&&(a[1])){
@@ -866 +868 @@
 
 (function(){
-        // scop protection
+        // scope protection
         try{
                 if(typeof dojo != "undefined"){
@@ -905 +907 @@
                                 throw new Error();
                         }
+
+                        if(this["document"]){
+                                // if we survived all of that, we're probably in a browser but
+                                // don't have Dojo handy. Load _browserRunner.js using a
+                                // document.write() call.
+
+                                // find runner.js, load _browserRunner relative to it
+                                var scripts = document.getElementsByTagName("script");
+                                for(var x=0; x<scripts.length; x++){
+                                        var s = scripts[x].src;
+                                        if(s && (s.substr(-9) == "runner.js")){
+                                                document.write("<scri"+"pt src='"+s.substr(0, s.length-9)+"_browserRunner.js' type='text/javascript'></scr"+"ipt>");
+                                        }
+                                }
+                        }
                 }
         }catch(e){