Ticket #6119: dojo_Jaxer.diff

sw/var/www/dojo/dojo.js

@@ -74 +74 @@
                         hostEnv = "spidermonkey";
                 }
                 var tmps = ["bootstrap.js", "loader.js", "hostenv_"+hostEnv+".js"];
-                if (this.Jaxer) {
+                if (this.Jaxer && this.Jaxer.isOnServer) {
                         this.load = Jaxer.load;
                 }
         
@@ -131 +131 @@
                 tmps.push(root+"_base.js");
         
                 for(var x=0; x < tmps.length; x++){
-                        if(isRhino||isSpidermonkey||this.Jaxer){
+                        if(isRhino||isSpidermonkey||(this.Jaxer&&this.Jaxer.isOnServer)){
                                 load(tmps[x]);
                         }else{
                                 try{