Changeset 7658
- Timestamp:
- 03/19/07 01:31:40 (22 months ago)
- Location:
- dojo/trunk/_base/_loader
- Files:
-
- 2 modified
-
bootstrap.js (modified) (1 diff)
-
loader.js (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dojo/trunk/_base/_loader/bootstrap.js
r7657 r7658 92 92 dojo.version = { 93 93 // summary: version number of this instance of dojo. 94 major: 0, minor: 4, patch: 1, flag: "+",94 major: 0, minor: 9, patch: 0, flag: "preM1", 95 95 revision: Number("$Rev$".match(/[0-9]+/)[0]), 96 96 toString: function(){ -
dojo/trunk/_base/_loader/loader.js
r7657 r7658 125 125 console.debug("failed loading ", uri, " with error: ", e); 126 126 } 127 return Boolean(ok && this. findModule(moduleName, false)); // Boolean127 return Boolean(ok && this._loadedModules[moduleName]); // Boolean 128 128 } 129 129 … … 273 273 274 274 omitModuleCheck = this._global_omit_module_check || omitModuleCheck; 275 var module = this. findModule(moduleName, false);275 var module = this._loadedModules[moduleName]; 276 276 if(module){ 277 277 return module; … … 318 318 if(!omitModuleCheck && !this["isXDomain"]){ 319 319 // pass in false so we can give better error 320 module = this. findModule(moduleName, false);320 module = this._loadedModules[moduleName]; 321 321 if(!module){ 322 322 throw new Error("symbol '" + moduleName + "' is not defined after loading '" + relpath + "'"); … … 369 369 } 370 370 371 dojo.findModule = function(/*String*/moduleName, /*Boolean?*/mustExist){372 // summary:373 // Returns the Object representing the module, if it exists, otherwise374 // null.375 // moduleName:376 // A fully qualified module including package name, like 'A.B'.377 // mustExist:378 // Optional, default false. throw instead of returning null if the379 // module does not currently exist.380 381 var lmn = String(moduleName);382 383 if(this._loadedModules[lmn]){384 return this._loadedModules[lmn]; // Object385 }386 387 if(mustExist){388 dojo.raise("no loaded module named '" + moduleName + "'");389 }390 return null; // null391 }392 393 371 //Start of old bootstrap2: 394 372