dojo_src 1.4.102 → 1.5.0

data/dojo/util/buildscripts/cldr/ldml/CatalogManager.properties

@@ -1,16 +1,16 @@
-#CatalogManager.properties
-
-verbosity=1
-
-relative-catalogs=no
-
-# Always use semicolons in this list
-catalogs= catalog;
-
-prefer=system
-
-static-catalog=yes
-
-allow-oasis-xml-catalog-pi=yes
-
-catalog-class-name=org.apache.xml.resolver.Resolver
+#CatalogManager.properties
+
+verbosity=1
+
+relative-catalogs=no
+
+# Always use semicolons in this list
+catalogs= catalog;
+
+prefer=system
+
+static-catalog=yes
+
+allow-oasis-xml-catalog-pi=yes
+
+catalog-class-name=org.apache.xml.resolver.Resolver

data/dojo/util/buildscripts/cldr/ldml/catalog

@@ -1,7 +1,7 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
 <system systemId="http://www.unicode.org/cldr/dtd/1.6/ldml.dtd"
-        uri="ldml.dtd"/>
+        uri="core/common/dtd/ldml.dtd"/>
 
 </catalog>
 

data/dojo/util/buildscripts/copyright.txt

@@ -1,5 +1,5 @@
 /*
-	Copyright (c) 2004-2009, The Dojo Foundation All Rights Reserved.
+	Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved.
 	Available via Academic Free License >= 2.1 OR the modified BSD license.
 	see: http://dojotoolkit.org/license for details
 */

data/dojo/util/buildscripts/jslib/buildUtil.js

@@ -190,6 +190,12 @@ buildUtil.DojoBuildOptions = {
 		helpText: "Removes the default 'com', 'org' and 'net' namespaces that are present in Rhino. This is hazardous to use if "
 			+ "the build system is used as part of a Rhino-based server-side solution, so use with caution. Weird build errors "
 			+ "might occur. Only use if your own code includes things in a com, org or net namespace."
+	},
+	"addGuards": {
+		defaultValue: true,
+		helpText: "Set to false to remove the code guards that protect modules from re-definition. In general you SHOULD NOT "
+			+ "set this value to false. Only do it if you want an even smaller Dojo Base build and you know the implications "
+			+ "of re-defining modules. It is bad. Do not do it."
 	}
 };
 
@@ -1893,6 +1899,9 @@ buildUtil.generateSym = function(/*String*/name){
 	s = "$D" + s;
 	buildUtil.symctr++;
 	var ret;
+	
+	//Make sure name is valid JS
+	name = name.replace(/-/g, "__");
 	if(kwArgs.symbol == "long"){
 		ret = name; // + "_" + s;
 	}else if(kwArgs.symbol == "short"){

data/dojo/util/buildscripts/jslib/dojoGuardEnd.jsfrag

@@ -1,11 +1,12 @@
 	//INSERT dojo.i18n._preloadLocalizations HERE
 
-	if(dojo.config.afterOnLoad && dojo.isBrowser){
-		//Dojo is being added to the page after page load, so just trigger
-		//the init sequence after a timeout. Using a timeout so the rest of this
-		//script gets evaluated properly. This work needs to happen after the
-		//dojo.config.require work done in dojo._base.
-		window.setTimeout(dojo._loadInit, 1000);
+	//Check if document already complete, and if so, just trigger page load
+	//listeners. NOTE: does not work with Firefox before 3.6. To support
+	//those browsers, set djConfig.afterOnLoad = true when you know Dojo is added
+	//after page load. Using a timeout so the rest of this
+	//script gets evaluated properly. This work needs to happen after the
+	//dojo.config.require work done in dojo._base.
+	if(dojo.isBrowser && (document.readyState === "complete" || dojo.config.afterOnLoad)){
+		window.setTimeout(dojo._loadInit, 100);
 	}
-
 })();

data/dojo/util/buildscripts/profiles/baseplus.profile.js

@@ -0,0 +1,21 @@
+dependencies = {
+	layers: [
+		{
+			// This is a specially named layer, literally 'dojo.js'
+			// adding dependencies to this layer will include the modules
+			// in addition to the standard dojo.js base APIs. 
+			name: "dojo.js",
+			dependencies: [
+				"dijit._Widget", 
+				"dijit._Templated",
+				"dojo.fx",
+				"dojo.NodeList-fx"
+			]
+		}
+	],
+
+	prefixes: [
+		[ "dijit", "../dijit" ],
+		[ "dojox", "../dojox" ]
+	]
+}

data/dojo/util/buildscripts/profiles/demos-all.profile.js

@@ -89,6 +89,13 @@ dependencies = {
 			dependencies:[
 				"demos.faces.src"
 			]
+		},
+		{
+			// the CSS3 animations demo
+			name: "../demos/css3/src.js",
+			dependencies:[
+				"demos.css3.src"
+			]
 		}
 	],
 	

data/dojo/util/buildscripts/tests/conditionalTest.js

@@ -1,9 +1,9 @@
 //Test file for the conditional comment inclusion/exclusion code.
 //Run this file from the util/buildscripts/tests directory.
 
-load("../jslib/buildUtil.js");
 load("../jslib/fileUtil.js");
 load("../jslib/logger.js");
+load("../jslib/buildUtil.js");
 
 
 

data/dojo/util/checkstyle/checkstyle.bat

@@ -1,3 +1,3 @@
-java -classpath ../shrinksafe/js.jar;../shrinksafe/shrinksafe.jar org.mozilla.javascript.tools.shell.Main runCheckstyle.js %*
-
-@rem java -Xms256m -Xmx256m -classpath ../shrinksafe/js.jar;../shrinksafe/shrinksafe.jar org.mozilla.javascript.tools.shell.Main  runCheckstyle.js %*
+java -classpath ../shrinksafe/js.jar;../shrinksafe/shrinksafe.jar org.mozilla.javascript.tools.shell.Main runCheckstyle.js %*
+
+@rem java -Xms256m -Xmx256m -classpath ../shrinksafe/js.jar;../shrinksafe/shrinksafe.jar org.mozilla.javascript.tools.shell.Main  runCheckstyle.js %*

data/dojo/util/checkstyle/checkstyleUtil.js

@@ -267,11 +267,33 @@ checkstyleUtil.createSpaceWrappedSearch = function(token, message){
 			before = contents.charAt(idx - 1);
 			after = contents.charAt(idx + tokenLength);
 			if(!comments[idx] && 
-				((before != " " && before != "\t" && (token != "==" || before != "!")) || 
+				((before != " " && before != "\t" 
+					&& (token != "==" || before != "!")
+					&& (token != "=" || 
+						(before != "<" && 
+						 before != ">" && 
+						 before != "=" && 
+						 before != "!" && 
+						 before != "+" && 
+						 before != "-" && 
+						 before != "*" && 
+						 before != "/" && 
+						 before != "&" && 
+						 before != "|" ))) || 
 				(
 					(after != " " && contents.charCodeAt(idx + tokenLength) != 13 
 						&& contents.charCodeAt(idx + tokenLength) != 10)
-				&& 	(token != "==" || after != "=")
+					&& (token != "==" || after != "=")
+					&& (token != "!=" || after != "=")
+					&& (token != "<" || after != "=")
+					&& (token != ">" || after != "=")
+					&& (token != "=" || after != "=")
+					&& (token != "&" || after != "=")
+					&& (token != "|" || after != "=")
+					&& (token != "+" || after != "=")
+					&& (token != "-" || after != "=")
+					&& (token != "*" || after != "=")
+					&& (token != "/" || after != "=")
 				))){
 				checkstyleUtil.addError(message, fileName, contents, idx);
 			}
@@ -451,7 +473,11 @@ checkstyleUtil.rules = {
 	},
 	
 	"spacesAroundEquals": checkstyleUtil.createSpaceWrappedSearch("==", "The equals sign should be preceded and followed by a space"),
+	"spacesAroundNotEquals": checkstyleUtil.createSpaceWrappedSearch("!=", "The != sign should be preceded and followed by a space"),
+	"spacesAroundAssignment": checkstyleUtil.createSpaceWrappedSearch("=", "The = sign should be preceded and followed by a space"),
 	"spacesAroundOr": checkstyleUtil.createSpaceWrappedSearch("||", "The || sign should be preceded and followed by a space"),
+	"spacesAroundLessThan": checkstyleUtil.createSpaceWrappedSearch("<", "The < sign should be preceded and followed by a space"),
+	"spacesAroundGreaterThan": checkstyleUtil.createSpaceWrappedSearch(">", "The > sign should be preceded and followed by a space"),
 	"spacesAroundAnd": checkstyleUtil.createSpaceWrappedSearch("&&", "The && sign should be preceded and followed by a space")
 };
 
@@ -533,8 +559,20 @@ checkstyleUtil.makeSimpleFixes = function(contents){
 	comments = checkstyleUtil.getComments(contents);
 	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "!==", comments);
 	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "<=", comments);
+	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "<", comments);
+	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, ">=", comments);
+	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, ">", comments);
+	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "!=", comments);
+	comments = checkstyleUtil.getComments(contents);
 	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "==", comments);
 	comments = checkstyleUtil.getComments(contents);
+	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "=", comments);
+	comments = checkstyleUtil.getComments(contents);
 	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "||", comments);
 	comments = checkstyleUtil.getComments(contents);
 	contents = checkstyleUtil.fixSpaceBeforeAndAfter(contents, "&&", comments);
@@ -670,7 +708,21 @@ checkstyleUtil.fixSpaceBeforeAndAfter = function(contents, token, comments){
 			// - char before is not a space or a tab
 			// - token is "==" and the char before is neither "!" or "="
 		
-			if(before != " " && before != "\t" && (token != "==" || (before != "!" && before != "="))){
+			if(before != " " && before != "\t" 
+				&& (token != "==" || (before != "!" && before != "="))
+				&& (token != "=" || 
+						(before != "<" && 
+						 before != ">" && 
+						 before != "=" && 
+						 before != "!" && 
+						 before != "+" && 
+						 before != "-" && 
+						 before != "*" && 
+						 before != "/" && 
+						 before != "&" && 
+						 before != "|" ))
+				){
+				
 				contents = checkstyleUtil.insertChar(contents, " ", idx);
 				idx ++;
 			}
@@ -681,7 +733,19 @@ checkstyleUtil.fixSpaceBeforeAndAfter = function(contents, token, comments){
 			// - char after is not "="
 			if((after != " " && contents.charCodeAt(idx + len) != 13 
 					&& contents.charCodeAt(idx + len) != 10)
-					&& (token != "==" || after != "=")){
+					&& (token != "==" || after != "=")
+					&& (token != "!=" || after != "=")
+					&& (token != "=" || after != "=")
+					&& (token != "<" || after != "=")
+					&& (token != ">" || after != "=")
+					&& (token != "&" || after != "=")
+					&& (token != "|" || after != "=")
+					&& (token != "+" || after != "=")
+					&& (token != "-" || after != "=")
+					&& (token != "*" || after != "=")
+					&& (token != "/" || after != "=")
+					
+					){
 				contents = contents = checkstyleUtil.insertChar(contents, " ", idx + token.length);
 				idx++;
 			}

data/dojo/util/checkstyle/runCheckstyle.js

@@ -13,6 +13,8 @@ if(arguments[0] == "help"){
 		+ "checkstyle \n\t"
 		+ "To specify a single directory to check in, including all child folders, use:\n\t\t"
 		+ "checkstyle dir={folderName}\n\t"
+		+ "To specify directories to ignore, use:\n\t\t"
+		+ "checkstyle ignoreDirs={folderName1},{folderName2}\n\t"
 		+ "To specify a list of files to process, use the 'files' parameter, passing a list of space separated files, e.g.\n\t\t"
 		+ "checkstyle files=\"dojo/_base/Color.js dojo/back.js\"\n\t"
 		+ "To force the script to fail when a specified file has failed the check, use the 'failOnError' parameter, e.g.\n\t\t"
@@ -38,7 +40,7 @@ if(arguments[0] == "help"){
 //********* Start checkstyle *********
 function checkstyle(){
 	
-	var dirs, i;
+	var dirs, i, ignoreDirs;
 	var reportFile = "./checkstyleData.js";
 
 	
@@ -65,6 +67,11 @@ function checkstyle(){
 	} else{
 		dirs = ["dojo", "dijit", "dojox"];
 	}
+	if(kwArgs.ignoreDirs){
+		ignoreDirs = kwArgs.ignoreDirs.split(",");
+	}else{
+		ignoreDirs = [];
+	}
 	
 	for(i = 0; i < dirs.length; i++){
 		var fileList = fileUtil.getFilteredFileList("../../" + dirs[i], /\.js$/, true);
@@ -72,7 +79,22 @@ function checkstyle(){
 			if(fileList[j].indexOf("/test") < 0
 				&& fileList[j].indexOf("/nls") < 0 
 				&& fileList[j].indexOf("/demos") < 0){
-				checkstyleUtil.applyRules(fileList[j], fileUtil.readFile(fileList[j]));
+				
+				var ignore = false;
+				if(ignoreDirs.length > 0){
+					for(var k = 0; k < ignoreDirs.length; k++){
+						if(fileList[j].indexOf(ignoreDirs[k]) > -1){
+							ignore = true;
+							break;
+						}else{
+							
+						}
+					}
+				}
+				
+				if(!ignore){
+					checkstyleUtil.applyRules(fileList[j], fileUtil.readFile(fileList[j]));
+				}
 			}
 		}
 	}

data/dojo/util/docscripts/LICENSE

@@ -13,7 +13,7 @@ The text of the AFL and BSD licenses is reproduced below.
 The "New" BSD License:
 **********************
 
-Copyright (c) 2005-2009, The Dojo Foundation
+Copyright (c) 2005-2010, The Dojo Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/dojo/util/docscripts/cheat/lib.js

@@ -55,7 +55,7 @@ dojo.provide("util.docscripts.cheat.lib");
 
 				"Language-Helpers":[
 					"isArray", "isFunction", "isString", "isObject", "isArrayLike", "unique", 
-					"eval", "isAlien", "trim", "Deferred", "_toArray", "replace"
+					"eval", "isAlien", "trim", "Deferred", "_toArray", "replace", "when"
 				],
 
 				"Arrays":[

data/dojo/util/docscripts/lib/parser2/JavaScriptArray.php

@@ -35,7 +35,7 @@ class JavaScriptArray extends Destructable {
 
   private function getType($position, $type) {
     $args = $this->all();
-    if (get_class($args[$position]) == $type) {
+	if ($args[$position] && get_class($args[$position]) == $type) {
       return $args[$position];
     }
   }
@@ -95,4 +95,4 @@ class JavaScriptArray extends Destructable {
   }
 }
 
-?>
+?>

data/dojo/util/docscripts/makeCix.php

@@ -13,7 +13,7 @@
 //
 
 // $Rev: $ 
-$current_version = "1.3.0";
+$current_version = "1.5.0";
 
 header("Content-type: text/xml");
 

data/dojo/util/doh/_browserRunner.js

@@ -54,6 +54,19 @@ if(window["dojo"]){
 			return str.replace(/&/gm, "&amp;").replace(/</gm, "&lt;").replace(/>/gm, "&gt;").replace(/"/gm, "&quot;"); // string
 		};
 
+		var formatTime = function(n){
+			switch(true){
+				case n<1000: //<1s
+					return n+"ms";
+				case n<60000: //<1m
+					return Math.round(n/100)/10+"s";
+				case n<3600000: //<1h
+					return Math.round(n/6000)/10+"m";
+				default: //>1h
+					return Math.round(n/360000)/10+"h";
+			}
+		};
+		
 		var _logBacklog = [], _loggedMsgLen = 0;
 		var sendToLogPane = function(args, skip){
 			var msg = "";
@@ -202,7 +215,7 @@ if(window["dojo"]){
 					cell = row.insertCell(-1);
 					cell.innerHTML=this._testCount+" tests in "+this._groupCount+" groups /<span class='failure'>"+this._errorCount+"</span> errors, <span class='failure'>"+this._failureCount+"</span> failures";
 					cell.setAttribute('_target',_loggedMsgLen+1);
-					row.insertCell(-1).innerHTML=doh._totalTime+"ms";
+					row.insertCell(-1).innerHTML=formatTime(doh._totalTime);
 				}
 				
 				//This location can do the final performance rendering for the results
@@ -316,6 +329,7 @@ if(window["dojo"]){
 			}
 		})(doh._report);
 		
+		doh.error = undefined;
 		if(this["opera"] && opera.postError){
 			doh.debug = function(){
 				var msg = "";
@@ -326,6 +340,12 @@ if(window["dojo"]){
 				opera.postError("DEBUG:"+msg);
 			}
 		}else if(window["console"]){
+			if(console.error){
+				doh.error = function(){
+					sendToLogPane.call(window, arguments);
+					console.error.apply(console, arguments);
+				};
+			} 
 			if(console.debug){
 				doh.debug = function(){
 					sendToLogPane.call(window, arguments);
@@ -351,6 +371,7 @@ if(window["dojo"]){
 				sendToLogPane.call(window, arguments);
 			}
 		}
+		doh.error = doh.error || doh.debug;
 
 		var loaded = false;
 		var groupTemplate = null;
@@ -488,7 +509,7 @@ if(window["dojo"]){
 			var gn = getGroupNode(group);
 			if(gn && doh._inGroup == group){
 				doh._totalTime += doh._groupTotalTime;
-				gn.getElementsByTagName("td")[3].innerHTML = doh._groupTotalTime+"ms";
+				gn.getElementsByTagName("td")[3].innerHTML = formatTime(doh._groupTotalTime);
 				gn.getElementsByTagName("td")[2].lastChild.className = "";
 				doh._inGroup = null;
 				//doh._runedSuite++;
@@ -499,7 +520,7 @@ if(window["dojo"]){
 				//byId("progressOuter").style.width = parseInt(this._runedSuite/this._suiteCount*100)+"%";
 			}
 			if(doh._inGroup == group){
-				this.debug("Total time for GROUP \"",group,"\" is ",doh._groupTotalTime,"ms");
+				this.debug("Total time for GROUP \"",group,"\" is ",formatTime(doh._groupTotalTime));
 			}
 		}
 
@@ -551,7 +572,7 @@ if(window["dojo"]){
 			var fn = getFixtureNode(group, fixture);
 			var elapsed = fixture.endTime-fixture.startTime;
 			if(fn){
-				fn.getElementsByTagName("td")[3].innerHTML = elapsed+"ms";
+				fn.getElementsByTagName("td")[3].innerHTML = formatTime(elapsed);
 				fn.className = (success) ? "success" : "failure";
 				fn.getElementsByTagName("td")[2].setAttribute('_target', _loggedMsgLen);
 				if(!success){

data/dojo/util/doh/_rhinoRunner.js

@@ -3,6 +3,7 @@ if(this["dojo"]){
 }
 
 doh.debug = print;
+doh.error = print;
 
 // Override the doh._report method to make it quit with an 
 // appropriate exit code in case of test failures.