moved dojo.ready calls in base to dojo/ready module; added feature to…

… load parser as per #12907; fixes #12907; refs #13113 git-svn-id: http://svn.dojotoolkit.org/src/dojo/trunk@25467 560b804f-0ae3-0310-86f3-f6aa0a117693
douathao · Jun 8, 2011 · c8a6b71 · c8a6b71
1 parent e04e4f6
commit c8a6b71
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/main.js b/main.js
@@ -56,14 +56,5 @@ define([
 		}
 	}
 
-	// dojoConfig.addOnLoad is deprecated; use require.ready
-	has.add("dojo-config-addOnLoad", 1);
-	if(has("dojo-config-addOnLoad")){
-		var addOnLoad= dojo.config.addOnLoad;
-		if(addOnLoad){
-			dojo.ready(dojo.isArray(addOnLoad) ? dojo.hitch.apply(dojo, addOnLoad) : addOnLoad);
-		}
-	}
-
 	return dojo;
 });
diff --git a/ready.js b/ready.js
@@ -100,5 +100,22 @@ define(["./_base/kernel", "./has", "require", "./domReady", "./_base/lang"], fun
 		}
 	});
 
+	has.add("dojo-config-addOnLoad", 1);
+	if(has("dojo-config-addOnLoad")){
+		var addOnLoad= dojo.config.addOnLoad;
+		if(addOnLoad){
+			dojo.ready(dojo.isArray(addOnLoad) ? dojo.hitch.apply(dojo, addOnLoad) : addOnLoad);
+		}
+	}
+
+	if(has("dojo-sync-loader") && dojo.config.parseOnLoad && !dojo.isAsync){
+		ready(99, function(){
+            if(!dojo.parser){
+                dojo.deprecated("Add explicit dojo.require('dojo.parser');", "", "2.0");
+                dojo.require("dojo.parser");
+            }
+		});
+	}
+
 	return ready;
 });