Changeset 7659

Timestamp:

03/19/07 01:42:32 (22 months ago)

Author:

alex

Message:

prevent leakage of an inadvertant global name. Refs #2500

Location:

dojo/trunk/_base/_loader

Files:

• hostenv_browser.js (modified) (2 diffs)
• loader.js (modified) (2 diffs)

dojo/trunk/_base/_loader/hostenv_browser.js

@@ -188 +188 @@
                 if(arguments.callee.initialized || (type!="domcontentloaded" && type!="load")){ return; }
                 arguments.callee.initialized = true;
-                if(typeof(_timer) != 'undefined'){
-                        clearInterval(_timer);
-                        delete _timer;
+                if(typeof dojo["_khtmlTimer"] != 'undefined'){
+                        clearInterval(dojo._khtmlTimer);
+                        delete dojo._khtmlTimer;
                 }
 
@@ -227 +227 @@
 
         if(/(WebKit|khtml)/i.test(navigator.userAgent)){ // sniff
-                var _timer = setInterval(function(){
+                dojo._khtmlTimer = setInterval(function(){
                         if(/loaded|complete/.test(document.readyState)){
                                 dojo._loadInit(); // call the onload handler

dojo/trunk/_base/_loader/loader.js

@@ -217 +217 @@
 }
 
-dojo.getModuleSymbols = function(/*String*/modulename){
+dojo._getModuleSymbols = function(/*String*/modulename){
         // summary:
         //              Converts a module name in dotted JS notation to an array
@@ -283 +283 @@
         var nsyms = moduleName.split(".");
         
-        var syms = this.getModuleSymbols(moduleName);
+        var syms = this._getModuleSymbols(moduleName);
         // console.debug(syms);
         var startedRelative = ((syms[0].charAt(0) != '/') && !syms[0].match(/^\w+:/));