dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/_base/Color.js.uncompressed.js

@@ -3,37 +3,31 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 	var Color = dojo.Color = function(/*Array|String|Object*/ color){
 		// summary:
 		//		Takes a named string, hex string, array of rgb or rgba values,
-		//		an object with r, g, b, and a properties, or another `dojo.Color` object
+		//		an object with r, g, b, and a properties, or another `Color` object
 		//		and creates a new Color instance to work from.
 		//
 		// example:
 		//		Work with a Color instance:
-		//	 | var c = new dojo.Color();
+		//	 | var c = new Color();
 		//	 | c.setColor([0,0,0]); // black
 		//	 | var hex = c.toHex(); // #000000
 		//
 		// example:
 		//		Work with a node's color:
 		//	 | var color = dojo.style("someNode", "backgroundColor");
-		//	 | var n = new dojo.Color(color);
+		//	 | var n = new Color(color);
 		//	 | // adjust the color some
 		//	 | n.r *= .5;
 		//	 | console.log(n.toString()); // rgb(128, 255, 255);
 		if(color){ this.setColor(color); }
 	};
 
-	/*=====
-	lang.mixin(dojo.Color,{
-		named:{
-			// summary: Dictionary list of all CSS named colors, by name. Values are 3-item arrays with corresponding RG and B values.
-		}
-	});
-	=====*/
-
 	// FIXME:
 	// there's got to be a more space-efficient way to encode or discover
 	// these!! Use hex?
 	Color.named = {
+		// summary:
+		//		Dictionary list of all CSS named colors, by name. Values are 3-item arrays with corresponding RG and B values.
 		"black":  [0,0,0],
 		"silver": [192,192,192],
 		"gray":	  [128,128,128],
@@ -61,11 +55,11 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 		setColor: function(/*Array|String|Object*/ color){
 			// summary:
 			//		Takes a named string, hex string, array of rgb or rgba values,
-			//		an object with r, g, b, and a properties, or another `dojo.Color` object
+			//		an object with r, g, b, and a properties, or another `Color` object
 			//		and sets this color instance to that value.
 			//
 			// example:
-			//	|	var c = new dojo.Color(); // no color
+			//	|	var c = new Color(); // no color
 			//	|	c.setColor("#ededed"); // greyish
 			if(lang.isString(color)){
 				Color.fromString(color, this);
@@ -75,7 +69,7 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 				this._set(color.r, color.g, color.b, color.a);
 				if(!(color instanceof Color)){ this.sanitize(); }
 			}
-			return this;	// dojo.Color
+			return this;	// Color
 		},
 		sanitize: function(){
 			// summary:
@@ -83,13 +77,13 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 			// description:
 			//		the default implementation does nothing, include dojo.colors to
 			//		augment it with real checks
-			return this;	// dojo.Color
+			return this;	// Color
 		},
 		toRgb: function(){
 			// summary:
 			//		Returns 3 component array of rgb values
 			// example:
-			//	|	var c = new dojo.Color("#000000");
+			//	|	var c = new Color("#000000");
 			//	|	console.log(c.toRgb()); // [0,0,0]
 			var t = this;
 			return [t.r, t.g, t.b]; // Array
@@ -105,7 +99,7 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 			// summary:
 			//		Returns a CSS color string in hexadecimal representation
 			// example:
-			//	|	console.log(new dojo.Color([0,0,0]).toHex()); // #000000
+			//	|	console.log(new Color([0,0,0]).toHex()); // #000000
 			var arr = ArrayUtil.map(["r", "g", "b"], function(x){
 				var s = this[x].toString(16);
 				return s.length < 2 ? "0" + s : s;
@@ -116,7 +110,7 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 			// summary:
 			//		Returns a css color string in rgb(a) representation
 			// example:
-			//	|	var c = new dojo.Color("#FFF").toCss();
+			//	|	var c = new Color("#FFF").toCss();
 			//	|	console.log(c); // rgb('255','255','255')
 			var t = this, rgb = t.r + ", " + t.g + ", " + t.b;
 			return (includeAlpha ? "rgba(" + rgb + ", " + t.a : "rgb(" + rgb) + ")";	// String
@@ -129,42 +123,42 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 	});
 
 	Color.blendColors = dojo.blendColors = function(
-		/*dojo.Color*/ start,
-		/*dojo.Color*/ end,
+		/*Color*/ start,
+		/*Color*/ end,
 		/*Number*/ weight,
-		/*dojo.Color?*/ obj
+		/*Color?*/ obj
 	){
 		// summary:
 		//		Blend colors end and start with weight from 0 to 1, 0.5 being a 50/50 blend,
-		//		can reuse a previously allocated dojo.Color object for the result
+		//		can reuse a previously allocated Color object for the result
 		var t = obj || new Color();
 		ArrayUtil.forEach(["r", "g", "b", "a"], function(x){
 			t[x] = start[x] + (end[x] - start[x]) * weight;
 			if(x != "a"){ t[x] = Math.round(t[x]); }
 		});
-		return t.sanitize();	// dojo.Color
+		return t.sanitize();	// Color
 	};
 
-	Color.fromRgb = dojo.colorFromRgb = function(/*String*/ color, /*dojo.Color?*/ obj){
+	Color.fromRgb = dojo.colorFromRgb = function(/*String*/ color, /*Color?*/ obj){
 		// summary:
-		//		Returns a `dojo.Color` instance from a string of the form
-		//		"rgb(...)" or "rgba(...)". Optionally accepts a `dojo.Color`
+		//		Returns a `Color` instance from a string of the form
+		//		"rgb(...)" or "rgba(...)". Optionally accepts a `Color`
 		//		object to update with the parsed value and return instead of
 		//		creating a new object.
 		// returns:
-		//		A dojo.Color object. If obj is passed, it will be the return value.
+		//		A Color object. If obj is passed, it will be the return value.
 		var m = color.toLowerCase().match(/^rgba?\(([\s\.,0-9]+)\)/);
-		return m && Color.fromArray(m[1].split(/\s*,\s*/), obj);	// dojo.Color
+		return m && Color.fromArray(m[1].split(/\s*,\s*/), obj);	// Color
 	};
 
-	Color.fromHex = dojo.colorFromHex = function(/*String*/ color, /*dojo.Color?*/ obj){
+	Color.fromHex = dojo.colorFromHex = function(/*String*/ color, /*Color?*/ obj){
 		// summary:
 		//		Converts a hex string with a '#' prefix to a color object.
 		//		Supports 12-bit #rgb shorthand. Optionally accepts a
-		//		`dojo.Color` object to update with the parsed value.
+		//		`Color` object to update with the parsed value.
 		//
 		// returns:
-		//		A dojo.Color object. If obj is passed, it will be the return value.
+		//		A Color object. If obj is passed, it will be the return value.
 		//
 		// example:
 		//	 | var thing = dojo.colorFromHex("#ededed"); // grey, longhand
@@ -176,7 +170,7 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 			mask = (1 << bits) - 1;
 		color = Number("0x" + color.substr(1));
 		if(isNaN(color)){
-			return null; // dojo.Color
+			return null; // Color
 		}
 		ArrayUtil.forEach(["b", "g", "r"], function(x){
 			var c = color & mask;
@@ -184,24 +178,24 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 			t[x] = bits == 4 ? 17 * c : c;
 		});
 		t.a = 1;
-		return t;	// dojo.Color
+		return t;	// Color
 	};
 
-	Color.fromArray = dojo.colorFromArray = function(/*Array*/ a, /*dojo.Color?*/ obj){
+	Color.fromArray = dojo.colorFromArray = function(/*Array*/ a, /*Color?*/ obj){
 		// summary:
-		//		Builds a `dojo.Color` from a 3 or 4 element array, mapping each
+		//		Builds a `Color` from a 3 or 4 element array, mapping each
 		//		element in sequence to the rgb(a) values of the color.
 		// example:
 		//		| var myColor = dojo.colorFromArray([237,237,237,0.5]); // grey, 50% alpha
 		// returns:
-		//		A dojo.Color object. If obj is passed, it will be the return value.
+		//		A Color object. If obj is passed, it will be the return value.
 		var t = obj || new Color();
 		t._set(Number(a[0]), Number(a[1]), Number(a[2]), Number(a[3]));
 		if(isNaN(t.a)){ t.a = 1; }
-		return t.sanitize();	// dojo.Color
+		return t.sanitize();	// Color
 	};
 
-	Color.fromString = dojo.colorFromString = function(/*String*/ str, /*dojo.Color?*/ obj){
+	Color.fromString = dojo.colorFromString = function(/*String*/ str, /*Color?*/ obj){
 		// summary:
 		//		Parses `str` for a color value. Accepts hex, rgb, and rgba
 		//		style color values.
@@ -211,9 +205,9 @@ define("dojo/_base/Color", ["./kernel", "./lang", "./array", "./config"], functi
 		//		rgb or rgba strings such as "rgb(133, 200, 16)" or "rgba(10, 10,
 		//		10, 50)"
 		// returns:
-		//		A dojo.Color object. If obj is passed, it will be the return value.
+		//		A Color object. If obj is passed, it will be the return value.
 		var a = Color.named[str];
-		return a && Color.fromArray(a, obj) || Color.fromRgb(str, obj) || Color.fromHex(str, obj);	// dojo.Color
+		return a && Color.fromArray(a, obj) || Color.fromRgb(str, obj) || Color.fromHex(str, obj);	// Color
 	};
 
 	return Color;

data/vendor/assets/javascripts/dojo/_base/Deferred.js

@@ -5,125 +5,125 @@
 */
 
 //>>built
-define("dojo/_base/Deferred",["./kernel","./lang"],function(_1,_2){
-var _3=function(){
+define("dojo/_base/Deferred",["./kernel","../Deferred","../promise/Promise","../errors/CancelError","../has","./lang","../when"],function(_1,_2,_3,_4,_5,_6,_7){
+var _8=function(){
 };
-var _4=Object.freeze||function(){
+var _9=Object.freeze||function(){
 };
-_1.Deferred=function(_5){
-var _6,_7,_8,_9,_a;
-var _b=(this.promise={});
-function _c(_d){
-if(_7){
+var _a=_1.Deferred=function(_b){
+var _c,_d,_e,_f,_10;
+var _11=(this.promise=new _3());
+function _12(_13){
+if(_d){
 throw new Error("This deferred has already been resolved");
 }
-_6=_d;
-_7=true;
-_e();
+_c=_13;
+_d=true;
+_14();
 };
-function _e(){
-var _f;
-while(!_f&&_a){
-var _10=_a;
-_a=_a.next;
-if((_f=(_10.progress==_3))){
-_7=false;
-}
-var _11=(_8?_10.error:_10.resolved);
-if(_11){
+function _14(){
+var _15;
+while(!_15&&_10){
+var _16=_10;
+_10=_10.next;
+if((_15=(_16.progress==_8))){
+_d=false;
+}
+var _17=(_e?_16.error:_16.resolved);
+if(_5("config-useDeferredInstrumentation")){
+if(_e&&_2.instrumentRejected){
+_2.instrumentRejected(_c,!!_17);
+}
+}
+if(_17){
 try{
-var _12=_11(_6);
-if(_12&&typeof _12.then==="function"){
-_12.then(_2.hitch(_10.deferred,"resolve"),_2.hitch(_10.deferred,"reject"),_2.hitch(_10.deferred,"progress"));
+var _18=_17(_c);
+if(_18&&typeof _18.then==="function"){
+_18.then(_6.hitch(_16.deferred,"resolve"),_6.hitch(_16.deferred,"reject"),_6.hitch(_16.deferred,"progress"));
 continue;
 }
-var _13=_f&&_12===undefined;
-if(_f&&!_13){
-_8=_12 instanceof Error;
+var _19=_15&&_18===undefined;
+if(_15&&!_19){
+_e=_18 instanceof Error;
 }
-_10.deferred[_13&&_8?"reject":"resolve"](_13?_6:_12);
+_16.deferred[_19&&_e?"reject":"resolve"](_19?_c:_18);
 }
 catch(e){
-_10.deferred.reject(e);
+_16.deferred.reject(e);
 }
 }else{
-if(_8){
-_10.deferred.reject(_6);
+if(_e){
+_16.deferred.reject(_c);
 }else{
-_10.deferred.resolve(_6);
+_16.deferred.resolve(_c);
 }
 }
 }
 };
-this.resolve=this.callback=function(_14){
+this.resolve=this.callback=function(_1a){
 this.fired=0;
-this.results=[_14,null];
-_c(_14);
+this.results=[_1a,null];
+_12(_1a);
 };
-this.reject=this.errback=function(_15){
-_8=true;
+this.reject=this.errback=function(_1b){
+_e=true;
 this.fired=1;
-_c(_15);
-this.results=[null,_15];
-if(!_15||_15.log!==false){
-(_1.config.deferredOnError||function(x){
-console.error(x);
-})(_15);
+if(_5("config-useDeferredInstrumentation")){
+if(_2.instrumentRejected){
+_2.instrumentRejected(_1b,!!_10);
 }
+}
+_12(_1b);
+this.results=[null,_1b];
 };
-this.progress=function(_16){
-var _17=_a;
-while(_17){
-var _18=_17.progress;
-_18&&_18(_16);
-_17=_17.next;
+this.progress=function(_1c){
+var _1d=_10;
+while(_1d){
+var _1e=_1d.progress;
+_1e&&_1e(_1c);
+_1d=_1d.next;
 }
 };
-this.addCallbacks=function(_19,_1a){
-this.then(_19,_1a,_3);
+this.addCallbacks=function(_1f,_20){
+this.then(_1f,_20,_8);
 return this;
 };
-_b.then=this.then=function(_1b,_1c,_1d){
-var _1e=_1d==_3?this:new _1.Deferred(_b.cancel);
-var _1f={resolved:_1b,error:_1c,progress:_1d,deferred:_1e};
-if(_a){
-_9=_9.next=_1f;
+_11.then=this.then=function(_21,_22,_23){
+var _24=_23==_8?this:new _a(_11.cancel);
+var _25={resolved:_21,error:_22,progress:_23,deferred:_24};
+if(_10){
+_f=_f.next=_25;
 }else{
-_a=_9=_1f;
+_10=_f=_25;
 }
-if(_7){
-_e();
+if(_d){
+_14();
 }
-return _1e.promise;
+return _24.promise;
 };
-var _20=this;
-_b.cancel=this.cancel=function(){
-if(!_7){
-var _21=_5&&_5(_20);
-if(!_7){
-if(!(_21 instanceof Error)){
-_21=new Error(_21);
+var _26=this;
+_11.cancel=this.cancel=function(){
+if(!_d){
+var _27=_b&&_b(_26);
+if(!_d){
+if(!(_27 instanceof Error)){
+_27=new _4(_27);
 }
-_21.log=false;
-_20.reject(_21);
+_27.log=false;
+_26.reject(_27);
 }
 }
 };
-_4(_b);
+_9(_11);
 };
-_2.extend(_1.Deferred,{addCallback:function(_22){
-return this.addCallbacks(_2.hitch.apply(_1,arguments));
-},addErrback:function(_23){
-return this.addCallbacks(null,_2.hitch.apply(_1,arguments));
-},addBoth:function(_24){
-var _25=_2.hitch.apply(_1,arguments);
-return this.addCallbacks(_25,_25);
+_6.extend(_a,{addCallback:function(_28){
+return this.addCallbacks(_6.hitch.apply(_1,arguments));
+},addErrback:function(_29){
+return this.addCallbacks(null,_6.hitch.apply(_1,arguments));
+},addBoth:function(_2a){
+var _2b=_6.hitch.apply(_1,arguments);
+return this.addCallbacks(_2b,_2b);
 },fired:-1});
-_1.Deferred.when=_1.when=function(_26,_27,_28,_29){
-if(_26&&typeof _26.then==="function"){
-return _26.then(_27,_28,_29);
-}
-return _27?_27(_26):_26;
-};
-return _1.Deferred;
+_a.when=_1.when=_7;
+return _a;
 });

data/vendor/assets/javascripts/dojo/_base/Deferred.js.uncompressed.js

@@ -1,18 +1,24 @@
-define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
+define("dojo/_base/Deferred", [
+	"./kernel",
+	"../Deferred",
+	"../promise/Promise",
+	"../errors/CancelError",
+	"../has",
+	"./lang",
+	"../when"
+], function(dojo, NewDeferred, Promise, CancelError, has, lang, when){
 	// module:
 	//		dojo/_base/Deferred
-	// summary:
-	//		This module defines dojo.Deferred.
 
 	var mutator = function(){};
 	var freeze = Object.freeze || function(){};
 	// A deferred provides an API for creating and resolving a promise.
-	dojo.Deferred = function(/*Function?*/ canceller){
+	var Deferred = dojo.Deferred = function(/*Function?*/ canceller){
 		// summary:
-		//		Deferreds provide a generic means for encapsulating an asynchronous
-		//		operation and notifying users of the completion and result of the operation.
+		//		Deprecated.   This module defines the legacy dojo/_base/Deferred API.
+		//		New code should use dojo/Deferred instead.
 		// description:
-		//		The dojo.Deferred API is based on the concept of promises that provide a
+		//		The Deferred API is based on the concept of promises that provide a
 		//		generic interface into the eventual completion of an asynchronous action.
 		//		The motivation for promises fundamentally is about creating a
 		//		separation of concerns that allows one to achieve the same type of
@@ -26,7 +32,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//		separated from the concerns of asynchronous interaction (which are
 		//		handled by the promise).
 		//
-		//		The dojo.Deferred is a type of promise that provides methods for fulfilling the
+		//		The Deferred is a type of promise that provides methods for fulfilling the
 		//		promise with a successful result or an error. The most important method for
 		//		working with Dojo's promises is the then() method, which follows the
 		//		CommonJS proposed promise API. An example of using a Dojo promise:
@@ -41,12 +47,12 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//		The .then() call returns a new promise that represents the result of the
 		//		execution of the callback. The callbacks will never affect the original promises value.
 		//
-		//		The dojo.Deferred instances also provide the following functions for backwards compatibility:
+		//		The Deferred instances also provide the following functions for backwards compatibility:
 		//
-		//			* addCallback(handler)
-		//			* addErrback(handler)
-		//			* callback(result)
-		//			* errback(result)
+		//		- addCallback(handler)
+		//		- addErrback(handler)
+		//		- callback(result)
+		//		- errback(result)
 		//
 		//		Callbacks are allowed to return promises themselves, so
 		//		you can build complicated sequences of events with ease.
@@ -59,7 +65,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//		another kind of error), so the errbacks should be prepared to
 		//		handle that error for cancellable Deferreds.
 		// example:
-		//	|	var deferred = new dojo.Deferred();
+		//	|	var deferred = new Deferred();
 		//	|	setTimeout(function(){ deferred.callback({success: true}); }, 1000);
 		//	|	return deferred;
 		// example:
@@ -102,7 +108,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//
 		//		|	// Deferred style:
 		//		|	function renderLotsOfData(data){
-		//		|		var d = new dojo.Deferred();
+		//		|		var d = new Deferred();
 		//		|		try{
 		//		|			for(var x in data){
 		//		|				renderDataitem(data[x]);
@@ -128,7 +134,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//
 		//		|	// Deferred style and async func
 		//		|	function renderLotsOfData(data){
-		//		|		var d = new dojo.Deferred();
+		//		|		var d = new Deferred();
 		//		|		setTimeout(function(){
 		//		|			try{
 		//		|				for(var x in data){
@@ -151,7 +157,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		//		handle the asynchronous case.
 
 		var result, finished, isError, head, nextListener;
-		var promise = (this.promise = {});
+		var promise = (this.promise = new Promise());
 
 		function complete(value){
 			if(finished){
@@ -169,7 +175,13 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 				if((mutated = (listener.progress == mutator))){ // assignment and check
 					finished = false;
 				}
+
 				var func = (isError ? listener.error : listener.resolved);
+				if(has("config-useDeferredInstrumentation")){
+					if(isError && NewDeferred.instrumentRejected){
+						NewDeferred.instrumentRejected(result, !!func);
+					}
+				}
 				if(func){
 					try{
 						var newResult = func(result);
@@ -210,11 +222,13 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 			//		Fulfills the Deferred instance as an error with the provided error
 			isError = true;
 			this.fired = 1;
+			if(has("config-useDeferredInstrumentation")){
+				if(NewDeferred.instrumentRejected){
+					NewDeferred.instrumentRejected(error, !!nextListener);
+				}
+			}
 			complete(error);
 			this.results = [null, error];
-			if(!error || error.log !== false){
-				(dojo.config.deferredOnError || function(x){ console.error(x); })(error);
-			}
 		};
 		// call progress to provide updates on the progress on the completion of the promise
 		this.progress = function(update){
@@ -231,13 +245,13 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 			// summary:
 			//		Adds callback and error callback for this deferred instance.
 			// callback: Function?
-			// 		The callback attached to this deferred object.
+			//		The callback attached to this deferred object.
 			// errback: Function?
-			// 		The error callback attached to this deferred object.
+			//		The error callback attached to this deferred object.
 			// returns:
-			// 		Returns this deferred object.
+			//		Returns this deferred object.
 			this.then(callback, errback, mutator);
-			return this;	// dojo.Deferred
+			return this;	// Deferred
 		};
 		// provide the implementation of the promise
 		promise.then = this.then = function(/*Function?*/resolvedCallback, /*Function?*/errorCallback, /*Function?*/progressCallback){
@@ -256,7 +270,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 			//		handler is the fulfillment value for the returned promise. If the callback
 			//		throws an error, the returned promise will be moved to failed state.
 			//
-			// returns: 
+			// returns:
 			//		Returns a new promise that represents the result of the
 			//		execution of the callback. The callbacks will never affect the original promises value.
 			// example:
@@ -266,7 +280,7 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 			//		|		then(printResult, onError);
 			//		|	>44
 			//
-			var returnDeferred = progressCallback == mutator ? this : new dojo.Deferred(promise.cancel);
+			var returnDeferred = progressCallback == mutator ? this : new Deferred(promise.cancel);
 			var listener = {
 				resolved: resolvedCallback,
 				error: errorCallback,
@@ -285,14 +299,14 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 			return returnDeferred.promise; // Promise
 		};
 		var deferred = this;
-		promise.cancel = this.cancel = function (){
+		promise.cancel = this.cancel = function(){
 			// summary:
 			//		Cancels the asynchronous operation
 			if(!finished){
 				var error = canceller && canceller(deferred);
 				if(!finished){
 					if (!(error instanceof Error)){
-						error = new Error(error);
+						error = new CancelError(error);
 					}
 					error.log = false;
 					deferred.reject(error);
@@ -301,66 +315,35 @@ define("dojo/_base/Deferred", ["./kernel", "./lang"], function(dojo, lang){
 		};
 		freeze(promise);
 	};
-	lang.extend(dojo.Deferred, {
-		addCallback: function (/*Function*/ callback){
+	lang.extend(Deferred, {
+		addCallback: function(/*Function*/ callback){
 			// summary:
-			// 		Adds successful callback for this deferred instance.
+			//		Adds successful callback for this deferred instance.
 			// returns:
-			// 		Returns this deferred object.
-			return this.addCallbacks(lang.hitch.apply(dojo, arguments));	// dojo.Deferred
+			//		Returns this deferred object.
+			return this.addCallbacks(lang.hitch.apply(dojo, arguments));	// Deferred
 		},
 
-		addErrback: function (/*Function*/ errback){
+		addErrback: function(/*Function*/ errback){
 			// summary:
-			// 		Adds error callback for this deferred instance.
+			//		Adds error callback for this deferred instance.
 			// returns:
-			// 		Returns this deferred object.
-			return this.addCallbacks(null, lang.hitch.apply(dojo, arguments));	// dojo.Deferred
+			//		Returns this deferred object.
+			return this.addCallbacks(null, lang.hitch.apply(dojo, arguments));	// Deferred
 		},
 
-		addBoth: function (/*Function*/ callback){
+		addBoth: function(/*Function*/ callback){
 			// summary:
-			// 		Add handler as both successful callback and error callback for this deferred instance.
+			//		Add handler as both successful callback and error callback for this deferred instance.
 			// returns:
-			// 		Returns this deferred object.
+			//		Returns this deferred object.
 			var enclosed = lang.hitch.apply(dojo, arguments);
-			return this.addCallbacks(enclosed, enclosed);	// dojo.Deferred
+			return this.addCallbacks(enclosed, enclosed);	// Deferred
 		},
 		fired: -1
 	});
 
-	dojo.Deferred.when = dojo.when = function(promiseOrValue, /*Function?*/ callback, /*Function?*/ errback, /*Function?*/ progressHandler){
-		// summary:
-		//		This provides normalization between normal synchronous values and
-		//		asynchronous promises, so you can interact with them in a common way
-		// returns:
-		// 		Returns a new promise that represents the result of the execution of callback 
-		// 		when parameter "promiseOrValue" is promise.
-		// 		Returns the execution result of callback when parameter "promiseOrValue" is value.
-		// example:
-		//		|	function printFirstAndLast(items){
-		//		|		dojo.when(findFirst(items), console.log);
-		//		|		dojo.when(findLast(items), console.log);
-		//		|	}
-		//		|	function findFirst(items){
-		//		|		return dojo.when(items, function(items){
-		//		|			return items[0];
-		//		|		});
-		//		|	}
-		//		|	function findLast(items){
-		//		|		return dojo.when(items, function(items){
-		//		|			return items[items.length - 1];
-		//		|		});
-		//		|	}
-		//		And now all three of his functions can be used sync or async.
-		//		|	printFirstAndLast([1,2,3,4]) will work just as well as
-		//		|	printFirstAndLast(dojo.xhrGet(...));
-
-		if(promiseOrValue && typeof promiseOrValue.then === "function"){
-			return promiseOrValue.then(callback, errback, progressHandler);
-		}
-		return callback ? callback(promiseOrValue) : promiseOrValue;	// Promise
-	};
+	Deferred.when = dojo.when = when;
 
-	return dojo.Deferred;
+	return Deferred;
 });