Changeset 12123

Timestamp:

01/21/08 22:03:30 (5 months ago)

Author:

jburke

Message:

Refs #4573: Convert to dojo.config instead of djConfig internally. \!strict

Location:

dijit/trunk

Files:

• tests/_testCommon.js (modified) (4 diffs)
• _editor/RichText.js (modified) (2 diffs)

dijit/trunk/tests/_testCommon.js

@@ -29 +29 @@
                                 case "locale":
                                         // locale string | null
-                                        djConfig.locale = locale = value;
+                                        dojo.config.locale = locale = value;
                                         break;
                                 case "dir":
@@ -46 +46 @@
 
         // always include the default theme files:
-        if(!theme){ theme = djConfig.defaultTestTheme || 'tundra'; }
+        if(!theme){ theme = dojo.config.defaultTestTheme || 'tundra'; }
         var themeCss = d.moduleUrl("dijit.themes",theme+"/"+theme+".css");
         var themeCssRtl = d.moduleUrl("dijit.themes",theme+"/"+theme+"_rtl.css");
@@ -52 +52 @@
         document.write('<link rel="stylesheet" type="text/css" href="'+themeCssRtl+'"/>');
 
-        if(djConfig.parseOnLoad){ 
-                djConfig.parseOnLoad = false;
-                djConfig._deferParsing = true;
+        if(dojo.config.parseOnLoad){ 
+                dojo.config.parseOnLoad = false;
+                dojo.config._deferParsing = true;
         }
 
@@ -72 +72 @@
                 d.connect(document,"onkeypress","_testNodeShow");
 
-                if(djConfig._deferParsing){ d.parser.parse(d.body()); }
+                if(dojo.config._deferParsing){ d.parser.parse(d.body()); }
 
         });

dijit/trunk/_editor/RichText.js

@@ -10 +10 @@
 // document.write will only work if RichText.js is included in the dojo.js
 // file. If it is included in dojo.js and you want to allow rich text saving
-// for back/forward actions, then set djConfig.allowXdRichTextSave = true.
-if(!djConfig["useXDomain"] || djConfig["allowXdRichTextSave"]){
+// for back/forward actions, then set dojo.config.allowXdRichTextSave = true.
+if(!dojo.config["useXDomain"] || dojo.config["allowXdRichTextSave"]){
         if(dojo._postLoad){
                 (function(){
@@ -303 +303 @@
                 this.domNode.appendChild(this.editingArea);
 
-                if(this.name != "" && (!djConfig["useXDomain"] || djConfig["allowXdRichTextSave"])){
+                if(this.name != "" && (!dojo.config["useXDomain"] || dojo.config["allowXdRichTextSave"])){
                         var saveTextarea = dojo.byId(dijit._scopeName + "._editor.RichText.savedContent");
                         if(saveTextarea.value != ""){