dojo-rails 0.9.9 → 0.9.10

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

@@ -1,8 +1,6 @@
-define("dojo/_base/url", ["./kernel"], function(dojo) {
+define("dojo/_base/url", ["./kernel"], function(dojo){
 	// module:
 	//		dojo/url
-	// summary:
-	//		This module contains dojo._Url
 
 	var
 		ore = new RegExp("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$"),

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

@@ -5,51 +5,48 @@
 */
 
 //>>built
-define("dojo/_base/window",["./kernel","../has","./sniff"],function(_1,_2){
-_1.doc=this["document"]||null;
-_1.body=function(){
-return _1.doc.body||_1.doc.getElementsByTagName("body")[0];
-};
-_1.setContext=function(_3,_4){
-_1.global=_5.global=_3;
-_1.doc=_5.doc=_4;
-};
-_1.withGlobal=function(_6,_7,_8,_9){
-var _a=_1.global;
+define("dojo/_base/window",["./kernel","./lang","../sniff"],function(_1,_2,_3){
+var _4={global:_1.global,doc:this["document"]||null,body:function(_5){
+_5=_5||_1.doc;
+return _5.body||_5.getElementsByTagName("body")[0];
+},setContext:function(_6,_7){
+_1.global=_4.global=_6;
+_1.doc=_4.doc=_7;
+},withGlobal:function(_8,_9,_a,_b){
+var _c=_1.global;
 try{
-_1.global=_5.global=_6;
-return _1.withDoc.call(null,_6.document,_7,_8,_9);
+_1.global=_4.global=_8;
+return _4.withDoc.call(null,_8.document,_9,_a,_b);
 }
 finally{
-_1.global=_5.global=_a;
+_1.global=_4.global=_c;
 }
-};
-_1.withDoc=function(_b,_c,_d,_e){
-var _f=_1.doc,_10=_1.isQuirks,_11=_1.isIE,_12,_13,_14;
+},withDoc:function(_d,_e,_f,_10){
+var _11=_4.doc,_12=_3("quirks"),_13=_3("ie"),_14,_15,_16;
 try{
-_1.doc=_5.doc=_b;
-_1.isQuirks=_2.add("quirks",_1.doc.compatMode=="BackCompat",true,true);
-if(_2("ie")){
-if((_14=_b.parentWindow)&&_14.navigator){
-_12=parseFloat(_14.navigator.appVersion.split("MSIE ")[1])||undefined;
-_13=_b.documentMode;
-if(_13&&_13!=5&&Math.floor(_12)!=_13){
-_12=_13;
+_1.doc=_4.doc=_d;
+_1.isQuirks=_3.add("quirks",_1.doc.compatMode=="BackCompat",true,true);
+if(_3("ie")){
+if((_16=_d.parentWindow)&&_16.navigator){
+_14=parseFloat(_16.navigator.appVersion.split("MSIE ")[1])||undefined;
+_15=_d.documentMode;
+if(_15&&_15!=5&&Math.floor(_14)!=_15){
+_14=_15;
 }
-_1.isIE=_2.add("ie",_12,true,true);
+_1.isIE=_3.add("ie",_14,true,true);
 }
 }
-if(_d&&typeof _c=="string"){
-_c=_d[_c];
+if(_f&&typeof _e=="string"){
+_e=_f[_e];
 }
-return _c.apply(_d,_e||[]);
+return _e.apply(_f,_10||[]);
 }
 finally{
-_1.doc=_5.doc=_f;
-_1.isQuirks=_2.add("quirks",_10,true,true);
-_1.isIE=_2.add("ie",_11,true,true);
+_1.doc=_4.doc=_11;
+_1.isQuirks=_3.add("quirks",_12,true,true);
+_1.isIE=_3.add("ie",_13,true,true);
 }
-};
-var _5={global:_1.global,doc:_1.doc,body:_1.body,setContext:_1.setContext,withGlobal:_1.withGlobal,withDoc:_1.withDoc};
-return _5;
+}};
+1&&_2.mixin(_1,_4);
+return _4;
 });

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

@@ -1,125 +1,133 @@
-define("dojo/_base/window", ["./kernel", "../has", "./sniff"], function(dojo, has){
-	// module:
-	//		dojo/window
-	// summary:
-	//		This module provides an API to save/set/restore the global/document scope.
+define("dojo/_base/window", ["./kernel", "./lang", "../sniff"], function(dojo, lang, has){
+// module:
+//		dojo/_base/window
 
-/*=====
-dojo.doc = {
-	// summary:
-	//		Alias for the current document. 'dojo.doc' can be modified
-	//		for temporary context shifting. Also see dojo.withDoc().
-	// description:
-	//		Refer to dojo.doc rather
-	//		than referring to 'window.document' to ensure your code runs
-	//		correctly in managed contexts.
-	// example:
-	//	|	n.appendChild(dojo.doc.createElement('div'));
-}
-=====*/
-dojo.doc = this["document"] || null;
-
-dojo.body = function(){
+var ret = {
 	// summary:
-	//		Return the body element of the document
-	//		return the body object associated with dojo.doc
-	// example:
-	//	|	dojo.body().appendChild(dojo.doc.createElement('div'));
-
-	// Note: document.body is not defined for a strict xhtml document
-	// Would like to memoize this, but dojo.doc can change vi dojo.withDoc().
-	return dojo.doc.body || dojo.doc.getElementsByTagName("body")[0]; // Node
-};
+	//		API to save/set/restore the global/document scope.
 
-dojo.setContext = function(/*Object*/globalObject, /*DocumentElement*/globalDocument){
-	// summary:
-	//		changes the behavior of many core Dojo functions that deal with
-	//		namespace and DOM lookup, changing them to work in a new global
-	//		context (e.g., an iframe). The varibles dojo.global and dojo.doc
-	//		are modified as a result of calling this function and the result of
-	//		`dojo.body()` likewise differs.
-	dojo.global = ret.global = globalObject;
-	dojo.doc = ret.doc = globalDocument;
-};
+	global: dojo.global,
+	/*=====
+	 global: {
+		 // summary:
+		 //		Alias for the current window. 'global' can be modified
+		 //		for temporary context shifting. See also withGlobal().
+		 // description:
+		 //		Use this rather than referring to 'window' to ensure your code runs
+		 //		correctly in managed contexts.
+	 },
+	 =====*/
 
-dojo.withGlobal = function(	/*Object*/globalObject,
-							/*Function*/callback,
-							/*Object?*/thisObject,
-							/*Array?*/cbArguments){
-	// summary:
-	//		Invoke callback with globalObject as dojo.global and
-	//		globalObject.document as dojo.doc.
-	// description:
-	//		Invoke callback with globalObject as dojo.global and
-	//		globalObject.document as dojo.doc. If provided, globalObject
-	//		will be executed in the context of object thisObject
-	//		When callback() returns or throws an error, the dojo.global
-	//		and dojo.doc will be restored to its previous state.
-
-	var oldGlob = dojo.global;
-	try{
+	doc: this["document"] || null,
+	/*=====
+	doc: {
+		// summary:
+		//		Alias for the current document. 'doc' can be modified
+		//		for temporary context shifting. See also withDoc().
+		// description:
+		//		Use this rather than referring to 'window.document' to ensure your code runs
+		//		correctly in managed contexts.
+		// example:
+		//	|	n.appendChild(dojo.doc.createElement('div'));
+	},
+	=====*/
+
+	body: function(/*Document?*/ doc){
+		// summary:
+		//		Return the body element of the specified document or of dojo/_base/window::doc.
+		// example:
+		//	|	win.body().appendChild(dojo.doc.createElement('div'));
+
+		// Note: document.body is not defined for a strict xhtml document
+		// Would like to memoize this, but dojo.doc can change vi dojo.withDoc().
+		doc = doc || dojo.doc;
+		return doc.body || doc.getElementsByTagName("body")[0]; // Node
+	},
+
+	setContext: function(/*Object*/ globalObject, /*DocumentElement*/ globalDocument){
+		// summary:
+		//		changes the behavior of many core Dojo functions that deal with
+		//		namespace and DOM lookup, changing them to work in a new global
+		//		context (e.g., an iframe). The varibles dojo.global and dojo.doc
+		//		are modified as a result of calling this function and the result of
+		//		`dojo.body()` likewise differs.
 		dojo.global = ret.global = globalObject;
-		return dojo.withDoc.call(null, globalObject.document, callback, thisObject, cbArguments);
-	}finally{
-		dojo.global = ret.global = oldGlob;
-	}
-};
+		dojo.doc = ret.doc = globalDocument;
+	},
 
-dojo.withDoc = function(	/*DocumentElement*/documentObject,
-							/*Function*/callback,
-							/*Object?*/thisObject,
-							/*Array?*/cbArguments){
-	// summary:
-	//		Invoke callback with documentObject as dojo.doc.
-	// description:
-	//		Invoke callback with documentObject as dojo.doc. If provided,
-	//		callback will be executed in the context of object thisObject
-	//		When callback() returns or throws an error, the dojo.doc will
-	//		be restored to its previous state.
-
-	var oldDoc = dojo.doc,
-		oldQ = dojo.isQuirks,
-		oldIE = dojo.isIE, isIE, mode, pwin;
-
-	try{
-		dojo.doc = ret.doc = documentObject;
-		// update dojo.isQuirks and the value of the has feature "quirks"
-		dojo.isQuirks = has.add("quirks", dojo.doc.compatMode == "BackCompat", true, true); // no need to check for QuirksMode which was Opera 7 only
-
-		if(has("ie")){
-			if((pwin = documentObject.parentWindow) && pwin.navigator){
-				// re-run IE detection logic and update dojo.isIE / has("ie")
-				// (the only time parentWindow/navigator wouldn't exist is if we were not
-				// passed an actual legitimate document object)
-				isIE = parseFloat(pwin.navigator.appVersion.split("MSIE ")[1]) || undefined;
-				mode = documentObject.documentMode;
-				if(mode && mode != 5 && Math.floor(isIE) != mode){
-					isIE = mode;
+	withGlobal: function(	/*Object*/ globalObject,
+							/*Function*/ callback,
+							/*Object?*/ thisObject,
+							/*Array?*/ cbArguments){
+		// summary:
+		//		Invoke callback with globalObject as dojo.global and
+		//		globalObject.document as dojo.doc.
+		// description:
+		//		Invoke callback with globalObject as dojo.global and
+		//		globalObject.document as dojo.doc. If provided, globalObject
+		//		will be executed in the context of object thisObject
+		//		When callback() returns or throws an error, the dojo.global
+		//		and dojo.doc will be restored to its previous state.
+
+		var oldGlob = dojo.global;
+		try{
+			dojo.global = ret.global = globalObject;
+			return ret.withDoc.call(null, globalObject.document, callback, thisObject, cbArguments);
+		}finally{
+			dojo.global = ret.global = oldGlob;
+		}
+	},
+
+	withDoc: function(	/*DocumentElement*/ documentObject,
+						/*Function*/ callback,
+						/*Object?*/ thisObject,
+						/*Array?*/ cbArguments){
+		// summary:
+		//		Invoke callback with documentObject as dojo/_base/window::doc.
+		// description:
+		//		Invoke callback with documentObject as dojo/_base/window::doc. If provided,
+		//		callback will be executed in the context of object thisObject
+		//		When callback() returns or throws an error, the dojo/_base/window::doc will
+		//		be restored to its previous state.
+
+		var oldDoc = ret.doc,
+			oldQ = has("quirks"),
+			oldIE = has("ie"), isIE, mode, pwin;
+
+		try{
+			dojo.doc = ret.doc = documentObject;
+			// update dojo.isQuirks and the value of the has feature "quirks".
+			// remove setting dojo.isQuirks and dojo.isIE for 2.0
+			dojo.isQuirks = has.add("quirks", dojo.doc.compatMode == "BackCompat", true, true); // no need to check for QuirksMode which was Opera 7 only
+
+			if(has("ie")){
+				if((pwin = documentObject.parentWindow) && pwin.navigator){
+					// re-run IE detection logic and update dojo.isIE / has("ie")
+					// (the only time parentWindow/navigator wouldn't exist is if we were not
+					// passed an actual legitimate document object)
+					isIE = parseFloat(pwin.navigator.appVersion.split("MSIE ")[1]) || undefined;
+					mode = documentObject.documentMode;
+					if(mode && mode != 5 && Math.floor(isIE) != mode){
+						isIE = mode;
+					}
+					dojo.isIE = has.add("ie", isIE, true, true);
 				}
-				dojo.isIE = has.add("ie", isIE, true, true);
 			}
-		}
 
-		if(thisObject && typeof callback == "string"){
-			callback = thisObject[callback];
-		}
+			if(thisObject && typeof callback == "string"){
+				callback = thisObject[callback];
+			}
 
-		return callback.apply(thisObject, cbArguments || []);
-	}finally{
-		dojo.doc = ret.doc = oldDoc;
-		dojo.isQuirks = has.add("quirks", oldQ, true, true);
-		dojo.isIE = has.add("ie", oldIE, true, true);
+			return callback.apply(thisObject, cbArguments || []);
+		}finally{
+			dojo.doc = ret.doc = oldDoc;
+			dojo.isQuirks = has.add("quirks", oldQ, true, true);
+			dojo.isIE = has.add("ie", oldIE, true, true);
+		}
 	}
 };
 
-var ret = {
-	global: dojo.global,
-	doc: dojo.doc,
-	body: dojo.body,
-	setContext: dojo.setContext,
-	withGlobal: dojo.withGlobal,
-	withDoc: dojo.withDoc
-};
+ 1  && lang.mixin(dojo, ret);
 
 return ret;
 

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

@@ -5,39 +5,9 @@
 */
 
 //>>built
-define("dojo/_base/xhr",["./kernel","./sniff","require","../io-query","../dom","../dom-form","./Deferred","./json","./lang","./array","../on"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,on){
-_2.add("native-xhr",function(){
-return typeof XMLHttpRequest!=="undefined";
-});
-if(1&&_3.getXhr){
-_1._xhrObj=_3.getXhr;
-}else{
-if(_2("native-xhr")){
-_1._xhrObj=function(){
-try{
-return new XMLHttpRequest();
-}
-catch(e){
-throw new Error("XMLHTTP not available: "+e);
-}
-};
-}else{
-for(var _b=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"],_c,i=0;i<3;){
-try{
-_c=_b[i++];
-if(new ActiveXObject(_c)){
-break;
-}
-}
-catch(e){
-}
-}
-_1._xhrObj=function(){
-return new ActiveXObject(_c);
-};
-}
-}
-var _d=_1.config;
+define("dojo/_base/xhr",["./kernel","./sniff","require","../io-query","../dom","../dom-form","./Deferred","./config","./json","./lang","./array","../on","../aspect","../request/watch","../request/xhr","../request/util"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9,_a,_b,on,_c,_d,_e,_f){
+_1._xhrObj=_e._create;
+var cfg=_1.config;
 _1.objectToQuery=_4.objectToQuery;
 _1.queryToObject=_4.queryToObject;
 _1.fieldToObject=_6.fieldToObject;
@@ -45,37 +15,37 @@ _1.formToObject=_6.toObject;
 _1.formToQuery=_6.toQuery;
 _1.formToJson=_6.toJson;
 _1._blockAsync=false;
-var _e=_1._contentHandlers=_1.contentHandlers={"text":function(_f){
-return _f.responseText;
+var _10=_1._contentHandlers=_1.contentHandlers={"text":function(xhr){
+return xhr.responseText;
 },"json":function(xhr){
-return _8.fromJson(xhr.responseText||null);
+return _9.fromJson(xhr.responseText||null);
 },"json-comment-filtered":function(xhr){
-if(!_1.config.useCommentedJson){
+if(!_8.useCommentedJson){
 console.warn("Consider using the standard mimetype:application/json."+" json-commenting can introduce security issues. To"+" decrease the chances of hijacking, use the standard the 'json' handler and"+" prefix your json with: {}&&\n"+"Use djConfig.useCommentedJson=true to turn off this message.");
 }
-var _10=xhr.responseText;
-var _11=_10.indexOf("/*");
-var _12=_10.lastIndexOf("*/");
-if(_11==-1||_12==-1){
+var _11=xhr.responseText;
+var _12=_11.indexOf("/*");
+var _13=_11.lastIndexOf("*/");
+if(_12==-1||_13==-1){
 throw new Error("JSON was not comment filtered");
 }
-return _8.fromJson(_10.substring(_11+2,_12));
+return _9.fromJson(_11.substring(_12+2,_13));
 },"javascript":function(xhr){
 return _1.eval(xhr.responseText);
 },"xml":function(xhr){
-var _13=xhr.responseXML;
+var _14=xhr.responseXML;
 if(_2("ie")){
-if((!_13||!_13.documentElement)){
+if((!_14||!_14.documentElement)){
 var ms=function(n){
 return "MSXML"+n+".DOMDocument";
 };
 var dp=["Microsoft.XMLDOM",ms(6),ms(4),ms(3),ms(2)];
-_a.some(dp,function(p){
+_b.some(dp,function(p){
 try{
 var dom=new ActiveXObject(p);
 dom.async=false;
 dom.loadXML(xhr.responseText);
-_13=dom;
+_14=dom;
 }
 catch(e){
 return false;
@@ -84,58 +54,69 @@ return true;
 });
 }
 }
-return _13;
+return _14;
 },"json-comment-optional":function(xhr){
 if(xhr.responseText&&/^[^{\[]*\/\*/.test(xhr.responseText)){
-return _e["json-comment-filtered"](xhr);
+return _10["json-comment-filtered"](xhr);
 }else{
-return _e["json"](xhr);
+return _10["json"](xhr);
 }
 }};
-_1._ioSetArgs=function(_14,_15,_16,_17){
-var _18={args:_14,url:_14.url};
-var _19=null;
-if(_14.form){
-var _1a=_5.byId(_14.form);
-var _1b=_1a.getAttributeNode("action");
-_18.url=_18.url||(_1b?_1b.value:null);
-_19=_6.toObject(_1a);
-}
-var _1c=[{}];
-if(_19){
-_1c.push(_19);
-}
-if(_14.content){
-_1c.push(_14.content);
-}
-if(_14.preventCache){
-_1c.push({"dojo.preventCache":new Date().valueOf()});
-}
-_18.query=_4.objectToQuery(_9.mixin.apply(null,_1c));
-_18.handleAs=_14.handleAs||"text";
-var d=new _7(_15);
-d.addCallbacks(_16,function(_1d){
-return _17(_1d,d);
+_1._ioSetArgs=function(_15,_16,_17,_18){
+var _19={args:_15,url:_15.url};
+var _1a=null;
+if(_15.form){
+var _1b=_5.byId(_15.form);
+var _1c=_1b.getAttributeNode("action");
+_19.url=_19.url||(_1c?_1c.value:null);
+_1a=_6.toObject(_1b);
+}
+var _1d=[{}];
+if(_1a){
+_1d.push(_1a);
+}
+if(_15.content){
+_1d.push(_15.content);
+}
+if(_15.preventCache){
+_1d.push({"dojo.preventCache":new Date().valueOf()});
+}
+_19.query=_4.objectToQuery(_a.mixin.apply(null,_1d));
+_19.handleAs=_15.handleAs||"text";
+var d=new _7(function(dfd){
+dfd.canceled=true;
+_16&&_16(dfd);
+var err=dfd.ioArgs.error;
+if(!err){
+err=new Error("request cancelled");
+err.dojoType="cancel";
+dfd.ioArgs.error=err;
+}
+return err;
 });
-var ld=_14.load;
-if(ld&&_9.isFunction(ld)){
+d.addCallback(_17);
+var ld=_15.load;
+if(ld&&_a.isFunction(ld)){
 d.addCallback(function(_1e){
-return ld.call(_14,_1e,_18);
+return ld.call(_15,_1e,_19);
 });
 }
-var err=_14.error;
-if(err&&_9.isFunction(err)){
+var err=_15.error;
+if(err&&_a.isFunction(err)){
 d.addErrback(function(_1f){
-return err.call(_14,_1f,_18);
+return err.call(_15,_1f,_19);
 });
 }
-var _20=_14.handle;
-if(_20&&_9.isFunction(_20)){
+var _20=_15.handle;
+if(_20&&_a.isFunction(_20)){
 d.addBoth(function(_21){
-return _20.call(_14,_21,_18);
+return _20.call(_15,_21,_19);
 });
 }
-if(_d.ioPublish&&_1.publish&&_18.args.ioPublish!==false){
+d.addErrback(function(_22){
+return _18(_22,d);
+});
+if(cfg.ioPublish&&_1.publish&&_19.args.ioPublish!==false){
 d.addCallbacks(function(res){
 _1.publish("/dojo/io/load",[d,res]);
 return res;
@@ -148,234 +129,137 @@ _1.publish("/dojo/io/done",[d,res]);
 return res;
 });
 }
-d.ioArgs=_18;
+d.ioArgs=_19;
 return d;
 };
-var _22=function(dfd){
-dfd.canceled=true;
-var xhr=dfd.ioArgs.xhr;
-var _23=typeof xhr.abort;
-if(_23=="function"||_23=="object"||_23=="unknown"){
-xhr.abort();
-}
-var err=dfd.ioArgs.error;
-if(!err){
-err=new Error("xhr cancelled");
-err.dojoType="cancel";
-}
-return err;
-};
-var _24=function(dfd){
-var ret=_e[dfd.ioArgs.handleAs](dfd.ioArgs.xhr);
+var _23=function(dfd){
+var ret=_10[dfd.ioArgs.handleAs](dfd.ioArgs.xhr);
 return ret===undefined?null:ret;
 };
-var _25=function(_26,dfd){
+var _24=function(_25,dfd){
 if(!dfd.ioArgs.args.failOk){
-console.error(_26);
+console.error(_25);
 }
-return _26;
+return _25;
 };
-var _27=null;
-var _28=[];
-var _29=0;
-var _2a=function(dfd){
-if(_29<=0){
-_29=0;
-if(_d.ioPublish&&_1.publish&&(!dfd||dfd&&dfd.ioArgs.args.ioPublish!==false)){
+var _26=function(dfd){
+if(_27<=0){
+_27=0;
+if(cfg.ioPublish&&_1.publish&&(!dfd||dfd&&dfd.ioArgs.args.ioPublish!==false)){
 _1.publish("/dojo/io/stop");
 }
 }
 };
-var _2b=function(){
-var now=(new Date()).getTime();
-if(!_1._blockAsync){
-for(var i=0,tif;i<_28.length&&(tif=_28[i]);i++){
-var dfd=tif.dfd;
-var _2c=function(){
-if(!dfd||dfd.canceled||!tif.validCheck(dfd)){
-_28.splice(i--,1);
-_29-=1;
-}else{
-if(tif.ioCheck(dfd)){
-_28.splice(i--,1);
-tif.resHandle(dfd);
-_29-=1;
-}else{
-if(dfd.startTime){
-if(dfd.startTime+(dfd.ioArgs.args.timeout||0)<now){
-_28.splice(i--,1);
-var err=new Error("timeout exceeded");
-err.dojoType="timeout";
-dfd.errback(err);
-dfd.cancel();
-_29-=1;
-}
-}
-}
-}
-};
-if(_1.config.debugAtAllCosts){
-_2c.call(this);
-}else{
-try{
-_2c.call(this);
-}
-catch(e){
-dfd.errback(e);
-}
-}
-}
-}
-_2a(dfd);
-if(!_28.length){
-clearInterval(_27);
-_27=null;
-}
-};
-_1._ioCancelAll=function(){
-try{
-_a.forEach(_28,function(i){
-try{
-i.dfd.cancel();
-}
-catch(e){
-}
+var _27=0;
+_c.after(_d,"_onAction",function(){
+_27-=1;
 });
-}
-catch(e){
-}
-};
-if(_2("ie")){
-on(window,"unload",_1._ioCancelAll);
-}
+_c.after(_d,"_onInFlight",_26);
+_1._ioCancelAll=_d.cancelAll;
 _1._ioNotifyStart=function(dfd){
-if(_d.ioPublish&&_1.publish&&dfd.ioArgs.args.ioPublish!==false){
-if(!_29){
+if(cfg.ioPublish&&_1.publish&&dfd.ioArgs.args.ioPublish!==false){
+if(!_27){
 _1.publish("/dojo/io/start");
 }
-_29+=1;
+_27+=1;
 _1.publish("/dojo/io/send",[dfd]);
 }
 };
-_1._ioWatch=function(dfd,_2d,_2e,_2f){
-var _30=dfd.ioArgs.args;
-if(_30.timeout){
-dfd.startTime=(new Date()).getTime();
-}
-_28.push({dfd:dfd,validCheck:_2d,ioCheck:_2e,resHandle:_2f});
-if(!_27){
-_27=setInterval(_2b,50);
-}
-if(_30.sync){
-_2b();
-}
-};
-var _31="application/x-www-form-urlencoded";
-var _32=function(dfd){
-return dfd.ioArgs.xhr.readyState;
-};
-var _33=function(dfd){
-return 4==dfd.ioArgs.xhr.readyState;
-};
-var _34=function(dfd){
-var xhr=dfd.ioArgs.xhr;
-if(_1._isDocumentOk(xhr)){
-dfd.callback(dfd);
-}else{
-var err=new Error("Unable to load "+dfd.ioArgs.url+" status:"+xhr.status);
-err.status=xhr.status;
-err.responseText=xhr.responseText;
-err.xhr=xhr;
-dfd.errback(err);
-}
+_1._ioWatch=function(dfd,_28,_29,_2a){
+var _2b=dfd.ioArgs.options=dfd.ioArgs.args;
+_a.mixin(dfd,{response:dfd.ioArgs,isValid:function(_2c){
+return _28(dfd);
+},isReady:function(_2d){
+return _29(dfd);
+},handleResponse:function(_2e){
+return _2a(dfd);
+}});
+_d(dfd);
+_26(dfd);
 };
-_1._ioAddQueryToUrl=function(_35){
-if(_35.query.length){
-_35.url+=(_35.url.indexOf("?")==-1?"?":"&")+_35.query;
-_35.query=null;
+var _2f="application/x-www-form-urlencoded";
+_1._ioAddQueryToUrl=function(_30){
+if(_30.query.length){
+_30.url+=(_30.url.indexOf("?")==-1?"?":"&")+_30.query;
+_30.query=null;
 }
 };
-_1.xhr=function(_36,_37,_38){
-var dfd=_1._ioSetArgs(_37,_22,_24,_25);
-var _39=dfd.ioArgs;
-var xhr=_39.xhr=_1._xhrObj(_39.args);
-if(!xhr){
-dfd.cancel();
-return dfd;
-}
-if("postData" in _37){
-_39.query=_37.postData;
+_1.xhr=function(_31,_32,_33){
+var _34;
+var dfd=_1._ioSetArgs(_32,function(dfd){
+_34&&_34.cancel();
+},_23,_24);
+var _35=dfd.ioArgs;
+if("postData" in _32){
+_35.query=_32.postData;
 }else{
-if("putData" in _37){
-_39.query=_37.putData;
+if("putData" in _32){
+_35.query=_32.putData;
 }else{
-if("rawBody" in _37){
-_39.query=_37.rawBody;
+if("rawBody" in _32){
+_35.query=_32.rawBody;
 }else{
-if((arguments.length>2&&!_38)||"POST|PUT".indexOf(_36.toUpperCase())==-1){
-_1._ioAddQueryToUrl(_39);
-}
+if((arguments.length>2&&!_33)||"POST|PUT".indexOf(_31.toUpperCase())===-1){
+_1._ioAddQueryToUrl(_35);
 }
 }
 }
-xhr.open(_36,_39.url,_37.sync!==true,_37.user||undefined,_37.password||undefined);
-if(_37.headers){
-for(var hdr in _37.headers){
-if(hdr.toLowerCase()==="content-type"&&!_37.contentType){
-_37.contentType=_37.headers[hdr];
-}else{
-if(_37.headers[hdr]){
-xhr.setRequestHeader(hdr,_37.headers[hdr]);
 }
+var _36={method:_31,handleAs:"text",timeout:_32.timeout,withCredentials:_32.withCredentials,ioArgs:_35};
+if(typeof _32.headers!=="undefined"){
+_36.headers=_32.headers;
 }
+if(typeof _32.contentType!=="undefined"){
+if(!_36.headers){
+_36.headers={};
 }
+_36.headers["Content-Type"]=_32.contentType;
 }
-if(_37.contentType!==false){
-xhr.setRequestHeader("Content-Type",_37.contentType||_31);
+if(typeof _35.query!=="undefined"){
+_36.data=_35.query;
 }
-if(!_37.headers||!("X-Requested-With" in _37.headers)){
-xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");
+if(typeof _32.sync!=="undefined"){
+_36.sync=_32.sync;
 }
 _1._ioNotifyStart(dfd);
-if(_1.config.debugAtAllCosts){
-xhr.send(_39.query);
-}else{
 try{
-xhr.send(_39.query);
+_34=_e(_35.url,_36,true);
 }
 catch(e){
-_39.error=e;
 dfd.cancel();
+return dfd;
 }
-}
-_1._ioWatch(dfd,_32,_33,_34);
-xhr=null;
+dfd.ioArgs.xhr=_34.response.xhr;
+_34.then(function(){
+dfd.resolve(dfd);
+}).otherwise(function(_37){
+_35.error=_37;
+dfd.reject(_37);
+});
 return dfd;
 };
-_1.xhrGet=function(_3a){
-return _1.xhr("GET",_3a);
+_1.xhrGet=function(_38){
+return _1.xhr("GET",_38);
 };
-_1.rawXhrPost=_1.xhrPost=function(_3b){
-return _1.xhr("POST",_3b,true);
+_1.rawXhrPost=_1.xhrPost=function(_39){
+return _1.xhr("POST",_39,true);
 };
-_1.rawXhrPut=_1.xhrPut=function(_3c){
-return _1.xhr("PUT",_3c,true);
+_1.rawXhrPut=_1.xhrPut=function(_3a){
+return _1.xhr("PUT",_3a,true);
 };
-_1.xhrDelete=function(_3d){
-return _1.xhr("DELETE",_3d);
+_1.xhrDelete=function(_3b){
+return _1.xhr("DELETE",_3b);
 };
-_1._isDocumentOk=function(_3e){
-var _3f=_3e.status||0;
-_3f=(_3f>=200&&_3f<300)||_3f==304||_3f==1223||!_3f;
-return _3f;
+_1._isDocumentOk=function(x){
+return _f.checkStatus(x.status);
 };
 _1._getText=function(url){
-var _40;
-_1.xhrGet({url:url,sync:true,load:function(_41){
-_40=_41;
+var _3c;
+_1.xhrGet({url:url,sync:true,load:function(_3d){
+_3c=_3d;
 }});
-return _40;
+return _3c;
 };
-_9.mixin(_1.xhr,{_xhrObj:_1._xhrObj,fieldToObject:_6.fieldToObject,formToObject:_6.toObject,objectToQuery:_4.objectToQuery,formToQuery:_6.toQuery,formToJson:_6.toJson,queryToObject:_4.queryToObject,contentHandlers:_e,_ioSetArgs:_1._ioSetArgs,_ioCancelAll:_1._ioCancelAll,_ioNotifyStart:_1._ioNotifyStart,_ioWatch:_1._ioWatch,_ioAddQueryToUrl:_1._ioAddQueryToUrl,_isDocumentOk:_1._isDocumentOk,_getText:_1._getText,get:_1.xhrGet,post:_1.xhrPost,put:_1.xhrPut,del:_1.xhrDelete});
+_a.mixin(_1.xhr,{_xhrObj:_1._xhrObj,fieldToObject:_6.fieldToObject,formToObject:_6.toObject,objectToQuery:_4.objectToQuery,formToQuery:_6.toQuery,formToJson:_6.toJson,queryToObject:_4.queryToObject,contentHandlers:_10,_ioSetArgs:_1._ioSetArgs,_ioCancelAll:_1._ioCancelAll,_ioNotifyStart:_1._ioNotifyStart,_ioWatch:_1._ioWatch,_ioAddQueryToUrl:_1._ioAddQueryToUrl,_isDocumentOk:_1._isDocumentOk,_getText:_1._getText,get:_1.xhrGet,post:_1.xhrPost,put:_1.xhrPut,del:_1.xhrDelete});
 return _1.xhr;
 });