Ticket #5878: dojo.diff

dojo.js

@@ -74 +74 @@
                         hostEnv = "spidermonkey";
                 }
                 var tmps = ["bootstrap.js", "loader.js", "hostenv_"+hostEnv+".js"];
+                if (this.Jaxer) {
+                        this.load = Jaxer.Includer.load;
+                        tmps.push("hostenv_jaxer.js");
+                }
         
                 if(
                         (this["djConfig"])&&
@@ -94 +98 @@
                         var root = "./";
                         if(isSpidermonkey){
                                 // auto-detect the base path via an exception. Hack!
-                                try{ throw new Error(""); }catch(e){ root = e.fileName.split("dojo.js")[0]; };
-                        }
+                                try{ throw new Error(""); }catch(e){ 
+                                        if (e.fileName.match("dojo.js")) {
+                                                root = e.fileName.split("dojo.js")[0];
+                                        } };                    }
                         if(!this["djConfig"]){
                                 djConfig = { baseUrl: root };
                         }
@@ -128 +134 @@
                 tmps.push(root+"_base.js");
         
                 for(var x=0; x < tmps.length; x++){
-                        if(isRhino||isSpidermonkey){
+                        if(isRhino||isSpidermonkey||this.Jaxer){
                                 load(tmps[x]);
                         }else{
                                 try{