dojo-rails 0.9.9 → 0.9.10

data/vendor/assets/javascripts/dojo/io/script.js

@@ -5,110 +5,86 @@
 */
 
 //>>built
-define("dojo/io/script",["../main"],function(_1){
-_1.getObject("io",true,_1);
-var _2=_1.isIE?"onreadystatechange":"load",_3=/complete|loaded/;
-_1.io.script={get:function(_4){
-var _5=this._makeScriptDeferred(_4);
-var _6=_5.ioArgs;
-_1._ioAddQueryToUrl(_6);
-_1._ioNotifyStart(_5);
-if(this._canAttach(_6)){
-var _7=this.attach(_6.id,_6.url,_4.frameDoc);
-if(!_6.jsonp&&!_6.args.checkString){
-var _8=_1.connect(_7,_2,function(_9){
-if(_9.type=="load"||_3.test(_7.readyState)){
-_1.disconnect(_8);
-_6.scriptLoaded=_9;
-}
+define("dojo/io/script",["../_base/connect","../_base/kernel","../_base/lang","../sniff","../_base/window","../_base/xhr","../dom","../dom-construct","../request/script"],function(_1,_2,_3,_4,_5,_6,_7,_8,_9){
+dojo.deprecated("dojo/io/script","Use dojo/request/script.","2.0");
+var _a={get:function(_b){
+var _c;
+var _d=this._makeScriptDeferred(_b,function(_e){
+_c&&_c.cancel();
 });
+var _f=_d.ioArgs;
+_6._ioAddQueryToUrl(_f);
+_6._ioNotifyStart(_d);
+_c=_9.get(_f.url,{timeout:_b.timeout,jsonp:_f.jsonp,checkString:_b.checkString,ioArgs:_f,frameDoc:_b.frameDoc,canAttach:function(_10){
+_f.requestId=_10.id;
+_f.scriptId=_10.scriptId;
+_f.canDelete=_10.canDelete;
+return _a._canAttach(_f);
+}},true);
+_c.then(function(){
+_d.resolve(_d);
+}).otherwise(function(_11){
+_d.ioArgs.error=_11;
+_d.reject(_11);
+});
+return _d;
+},attach:_9._attach,remove:_9._remove,_makeScriptDeferred:function(_12,_13){
+var dfd=_6._ioSetArgs(_12,_13||this._deferredCancel,this._deferredOk,this._deferredError);
+var _14=dfd.ioArgs;
+_14.id=_2._scopeName+"IoScript"+(this._counter++);
+_14.canDelete=false;
+_14.jsonp=_12.callbackParamName||_12.jsonp;
+if(_14.jsonp){
+_14.query=_14.query||"";
+if(_14.query.length>0){
+_14.query+="&";
 }
-}
-_1._ioWatch(_5,this._validCheck,this._ioCheck,this._resHandle);
-return _5;
-},attach:function(id,_a,_b){
-var _c=(_b||_1.doc);
-var _d=_c.createElement("script");
-_d.type="text/javascript";
-_d.src=_a;
-_d.id=id;
-_d.async=true;
-_d.charset="utf-8";
-return _c.getElementsByTagName("head")[0].appendChild(_d);
-},remove:function(id,_e){
-_1.destroy(_1.byId(id,_e));
-if(this["jsonp_"+id]){
-delete this["jsonp_"+id];
-}
-},_makeScriptDeferred:function(_f){
-var dfd=_1._ioSetArgs(_f,this._deferredCancel,this._deferredOk,this._deferredError);
-var _10=dfd.ioArgs;
-_10.id=_1._scopeName+"IoScript"+(this._counter++);
-_10.canDelete=false;
-_10.jsonp=_f.callbackParamName||_f.jsonp;
-if(_10.jsonp){
-_10.query=_10.query||"";
-if(_10.query.length>0){
-_10.query+="&";
-}
-_10.query+=_10.jsonp+"="+(_f.frameDoc?"parent.":"")+_1._scopeName+".io.script.jsonp_"+_10.id+"._jsonpCallback";
-_10.frameDoc=_f.frameDoc;
-_10.canDelete=true;
+_14.query+=_14.jsonp+"="+(_12.frameDoc?"parent.":"")+_2._scopeName+".io.script.jsonp_"+_14.id+"._jsonpCallback";
+_14.frameDoc=_12.frameDoc;
+_14.canDelete=true;
 dfd._jsonpCallback=this._jsonpCallback;
-this["jsonp_"+_10.id]=dfd;
+this["jsonp_"+_14.id]=dfd;
 }
 return dfd;
 },_deferredCancel:function(dfd){
 dfd.canceled=true;
-if(dfd.ioArgs.canDelete){
-_1.io.script._addDeadScript(dfd.ioArgs);
-}
 },_deferredOk:function(dfd){
-var _11=dfd.ioArgs;
-if(_11.canDelete){
-_1.io.script._addDeadScript(_11);
-}
-return _11.json||_11.scriptLoaded||_11;
-},_deferredError:function(_12,dfd){
-if(dfd.ioArgs.canDelete){
-if(_12.dojoType=="timeout"){
-_1.io.script.remove(dfd.ioArgs.id,dfd.ioArgs.frameDoc);
-}else{
-_1.io.script._addDeadScript(dfd.ioArgs);
-}
-}
-return _12;
-},_deadScripts:[],_counter:1,_addDeadScript:function(_13){
-_1.io.script._deadScripts.push({id:_13.id,frameDoc:_13.frameDoc});
-_13.frameDoc=null;
+var _15=dfd.ioArgs;
+return _15.json||_15.scriptLoaded||_15;
+},_deferredError:function(_16,dfd){
+return _16;
+},_deadScripts:[],_counter:1,_addDeadScript:function(_17){
+_a._deadScripts.push({id:_17.id,frameDoc:_17.frameDoc});
+_17.frameDoc=null;
 },_validCheck:function(dfd){
-var _14=_1.io.script;
-var _15=_14._deadScripts;
-if(_15&&_15.length>0){
-for(var i=0;i<_15.length;i++){
-_14.remove(_15[i].id,_15[i].frameDoc);
-_15[i].frameDoc=null;
+var _18=_a._deadScripts;
+if(_18&&_18.length>0){
+for(var i=0;i<_18.length;i++){
+_a.remove(_18[i].id,_18[i].frameDoc);
+_18[i].frameDoc=null;
 }
-_1.io.script._deadScripts=[];
+_a._deadScripts=[];
 }
 return true;
 },_ioCheck:function(dfd){
-var _16=dfd.ioArgs;
-if(_16.json||(_16.scriptLoaded&&!_16.args.checkString)){
+var _19=dfd.ioArgs;
+if(_19.json||(_19.scriptLoaded&&!_19.args.checkString)){
 return true;
 }
-var _17=_16.args.checkString;
-return _17&&eval("typeof("+_17+") != 'undefined'");
+var _1a=_19.args.checkString;
+return _1a&&eval("typeof("+_1a+") != 'undefined'");
 },_resHandle:function(dfd){
-if(_1.io.script._ioCheck(dfd)){
+if(_a._ioCheck(dfd)){
 dfd.callback(dfd);
 }else{
 dfd.errback(new Error("inconceivable dojo.io.script._resHandle error"));
 }
-},_canAttach:function(_18){
+},_canAttach:function(){
 return true;
-},_jsonpCallback:function(_19){
-this.ioArgs.json=_19;
+},_jsonpCallback:function(_1b){
+this.ioArgs.json=_1b;
+_2.global[_9._callbacksProperty][this.ioArgs.requestId](_1b);
 }};
-return _1.io.script;
+_3.setObject("dojo.io.script",_a);
+return _a;
 });

data/vendor/assets/javascripts/dojo/io/script.js.uncompressed.js

@@ -1,114 +1,95 @@
-define("dojo/io/script", ["../main"], function(dojo) {
+define("dojo/io/script", [
+	"../_base/connect", /*===== "../_base/declare", =====*/ "../_base/kernel", "../_base/lang",
+	"../sniff", "../_base/window","../_base/xhr",
+	"../dom", "../dom-construct", "../request/script"
+], function(connect, /*===== declare, =====*/ kernel, lang, has, win, xhr, dom, domConstruct, _script){
+
 	// module:
 	//		dojo/io/script
-	// summary:
-	//		TODOC
 
-	dojo.getObject("io", true, dojo);
+	dojo.deprecated("dojo/io/script", "Use dojo/request/script.", "2.0");
 
-/*=====
-dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
-	constructor: function(){
-		//	summary:
+	/*=====
+	var __ioArgs = declare(kernel.__IoArgs, {
+		// summary:
 		//		All the properties described in the dojo.__ioArgs type, apply to this
 		//		type as well, EXCEPT "handleAs". It is not applicable to
-		//		dojo.io.script.get() calls, since it is implied by the usage of
+		//		dojo/io/script.get() calls, since it is implied by the usage of
 		//		"jsonp" (response will be a JSONP call returning JSON)
 		//		or the response is pure JavaScript defined in
 		//		the body of the script that was attached.
-		//	callbackParamName: String
+		// callbackParamName: String
 		//		Deprecated as of Dojo 1.4 in favor of "jsonp", but still supported for
 		//		legacy code. See notes for jsonp property.
-		//	jsonp: String
+		// jsonp: String
 		//		The URL parameter name that indicates the JSONP callback string.
 		//		For instance, when using Yahoo JSONP calls it is normally,
 		//		jsonp: "callback". For AOL JSONP calls it is normally
 		//		jsonp: "c".
-		//	checkString: String
+		// checkString: String
 		//		A string of JavaScript that when evaluated like so:
 		//		"typeof(" + checkString + ") != 'undefined'"
 		//		being true means that the script fetched has been loaded.
 		//		Do not use this if doing a JSONP type of call (use callbackParamName instead).
-		//	frameDoc: Document
+		// frameDoc: Document
 		//		The Document object for a child iframe. If this is passed in, the script
 		//		will be attached to that document. This can be helpful in some comet long-polling
 		//		scenarios with Firefox and Opera.
-		this.callbackParamName = callbackParamName;
-		this.jsonp = jsonp;
-		this.checkString = checkString;
-		this.frameDoc = frameDoc;
-	}
-});
-=====*/
+	});
+	=====*/
 
-	var loadEvent = dojo.isIE ? "onreadystatechange" : "load",
-		readyRegExp = /complete|loaded/;
+	var script = {
+		// summary:
+		//		TODOC
 
-	dojo.io.script = {
-		get: function(/*dojo.io.script.__ioArgs*/args){
-			//	summary:
+		get: function(/*__ioArgs*/ args){
+			// summary:
 			//		sends a get request using a dynamically created script tag.
-			var dfd = this._makeScriptDeferred(args);
+			var rDfd;
+			var dfd = this._makeScriptDeferred(args, function(dfd){
+				rDfd && rDfd.cancel();
+			});
 			var ioArgs = dfd.ioArgs;
-			dojo._ioAddQueryToUrl(ioArgs);
-
-			dojo._ioNotifyStart(dfd);
-
-			if(this._canAttach(ioArgs)){
-				var node = this.attach(ioArgs.id, ioArgs.url, args.frameDoc);
-
-				//If not a jsonp callback or a polling checkString case, bind
-				//to load event on the script tag.
-				if(!ioArgs.jsonp && !ioArgs.args.checkString){
-					var handle = dojo.connect(node, loadEvent, function(evt){
-						if(evt.type == "load" || readyRegExp.test(node.readyState)){
-							dojo.disconnect(handle);
-							ioArgs.scriptLoaded = evt;
-						}
-					});
+			xhr._ioAddQueryToUrl(ioArgs);
+
+			xhr._ioNotifyStart(dfd);
+
+			rDfd = _script.get(ioArgs.url, {
+				timeout: args.timeout,
+				jsonp: ioArgs.jsonp,
+				checkString: args.checkString,
+				ioArgs: ioArgs,
+				frameDoc: args.frameDoc,
+				canAttach: function(rDfd){
+					// sync values
+					ioArgs.requestId = rDfd.id;
+					ioArgs.scriptId = rDfd.scriptId;
+					ioArgs.canDelete = rDfd.canDelete;
+
+					return script._canAttach(ioArgs);
 				}
-			}
+			}, true);
 
-			dojo._ioWatch(dfd, this._validCheck, this._ioCheck, this._resHandle);
-			return dfd;
-		},
+			rDfd.then(function(){
+				dfd.resolve(dfd);
+			}).otherwise(function(error){
+				dfd.ioArgs.error = error;
+				dfd.reject(error);
+			});
 
-		attach: function(/*String*/id, /*String*/url, /*Document?*/frameDocument){
-			//	summary:
-			//		creates a new <script> tag pointing to the specified URL and
-			//		adds it to the document.
-			//	description:
-			//		Attaches the script element to the DOM.	 Use this method if you
-			//		just want to attach a script to the DOM and do not care when or
-			//		if it loads.
-			var doc = (frameDocument || dojo.doc);
-			var element = doc.createElement("script");
-			element.type = "text/javascript";
-			element.src = url;
-			element.id = id;
-			element.async = true;
-			element.charset = "utf-8";
-			return doc.getElementsByTagName("head")[0].appendChild(element);
+			return dfd;
 		},
 
-		remove: function(/*String*/id, /*Document?*/frameDocument){
-			//summary: removes the script element with the given id, from the given frameDocument.
-			//If no frameDocument is passed, the current document is used.
-			dojo.destroy(dojo.byId(id, frameDocument));
+		attach: _script._attach,
+		remove: _script._remove,
 
-			//Remove the jsonp callback on dojo.io.script, if it exists.
-			if(this["jsonp_" + id]){
-				delete this["jsonp_" + id];
-			}
-		},
-
-		_makeScriptDeferred: function(/*Object*/args){
-			//summary:
+		_makeScriptDeferred: function(/*Object*/ args, /*Function?*/ cancel){
+			// summary:
 			//		sets up a Deferred object for an IO request.
-			var dfd = dojo._ioSetArgs(args, this._deferredCancel, this._deferredOk, this._deferredError);
+			var dfd = xhr._ioSetArgs(args, cancel || this._deferredCancel, this._deferredOk, this._deferredError);
 
 			var ioArgs = dfd.ioArgs;
-			ioArgs.id = dojo._scopeName + "IoScript" + (this._counter++);
+			ioArgs.id = kernel._scopeName + "IoScript" + (this._counter++);
 			ioArgs.canDelete = false;
 
 			//Special setup for jsonp case
@@ -119,10 +100,9 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 				if(ioArgs.query.length > 0){
 					ioArgs.query += "&";
 				}
-				ioArgs.query += ioArgs.jsonp
-					+ "="
-					+ (args.frameDoc ? "parent." : "")
-					+ dojo._scopeName + ".io.script.jsonp_" + ioArgs.id + "._jsonpCallback";
+				ioArgs.query += ioArgs.jsonp +
+					"=" + (args.frameDoc ? "parent." : "") +
+					kernel._scopeName + ".io.script.jsonp_" + ioArgs.id + "._jsonpCallback";
 
 				ioArgs.frameDoc = args.frameDoc;
 
@@ -131,30 +111,24 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 				dfd._jsonpCallback = this._jsonpCallback;
 				this["jsonp_" + ioArgs.id] = dfd;
 			}
-			return dfd; // dojo.Deferred
+			return dfd; // dojo/_base/Deferred
 		},
 
-		_deferredCancel: function(/*Deferred*/dfd){
-			//summary: canceller function for dojo._ioSetArgs call.
+		_deferredCancel: function(/*Deferred*/ dfd){
+			// summary:
+			//		canceller function for xhr._ioSetArgs call.
 
-			//DO NOT use "this" and expect it to be dojo.io.script.
+			//DO NOT use "this" and expect it to be script.
 			dfd.canceled = true;
-			if(dfd.ioArgs.canDelete){
-				dojo.io.script._addDeadScript(dfd.ioArgs);
-			}
 		},
 
-		_deferredOk: function(/*Deferred*/dfd){
-			//summary: okHandler function for dojo._ioSetArgs call.
+		_deferredOk: function(/*Deferred*/ dfd){
+			// summary:
+			//		okHandler function for xhr._ioSetArgs call.
 
-			//DO NOT use "this" and expect it to be dojo.io.script.
+			//DO NOT use "this" and expect it to be script.
 			var ioArgs = dfd.ioArgs;
 
-			//Add script to list of things that can be removed.
-			if(ioArgs.canDelete){
-				dojo.io.script._addDeadScript(ioArgs);
-			}
-
 			//Favor JSONP responses, script load events then lastly ioArgs.
 			//The ioArgs are goofy, but cannot return the dfd since that stops
 			//the callback chain in Deferred. The return value is not that important
@@ -162,19 +136,10 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 			return ioArgs.json || ioArgs.scriptLoaded || ioArgs;
 		},
 
-		_deferredError: function(/*Error*/error, /*Deferred*/dfd){
-			//summary: errHandler function for dojo._ioSetArgs call.
-
-			if(dfd.ioArgs.canDelete){
-				//DO NOT use "this" and expect it to be dojo.io.script.
-				if(error.dojoType == "timeout"){
-					//For timeouts, remove the script element immediately to
-					//avoid a response from it coming back later and causing trouble.
-					dojo.io.script.remove(dfd.ioArgs.id, dfd.ioArgs.frameDoc);
-				}else{
-					dojo.io.script._addDeadScript(dfd.ioArgs);
-				}
-			}
+		_deferredError: function(/*Error*/ error, /*Deferred*/ dfd){
+			// summary:
+			//		errHandler function for xhr._ioSetArgs call.
+
 			console.log("dojo.io.script error", error);
 			return error;
 		},
@@ -182,36 +147,41 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 		_deadScripts: [],
 		_counter: 1,
 
-		_addDeadScript: function(/*Object*/ioArgs){
-			//summary: sets up an entry in the deadScripts array.
-			dojo.io.script._deadScripts.push({id: ioArgs.id, frameDoc: ioArgs.frameDoc});
+		_addDeadScript: function(/*Object*/ ioArgs){
+			// summary:
+			//		sets up an entry in the deadScripts array.
+			script._deadScripts.push({id: ioArgs.id, frameDoc: ioArgs.frameDoc});
 			//Being extra paranoid about leaks:
 			ioArgs.frameDoc = null;
 		},
 
-		_validCheck: function(/*Deferred*/dfd){
-			//summary: inflight check function to see if dfd is still valid.
+		_validCheck: function(/*Deferred*/ dfd){
+			// summary:
+			//		inflight check function to see if dfd is still valid.
+
+			// TODO: why isn't dfd accessed?
 
 			//Do script cleanup here. We wait for one inflight pass
 			//to make sure we don't get any weird things by trying to remove a script
 			//tag that is part of the call chain (IE 6 has been known to
 			//crash in that case).
-			var _self = dojo.io.script;
-			var deadScripts = _self._deadScripts;
+			var deadScripts = script._deadScripts;
 			if(deadScripts && deadScripts.length > 0){
 				for(var i = 0; i < deadScripts.length; i++){
 					//Remove the script tag
-					_self.remove(deadScripts[i].id, deadScripts[i].frameDoc);
+					script.remove(deadScripts[i].id, deadScripts[i].frameDoc);
 					deadScripts[i].frameDoc = null;
 				}
-				dojo.io.script._deadScripts = [];
+				script._deadScripts = [];
 			}
 
 			return true;
 		},
 
-		_ioCheck: function(/*Deferred*/dfd){
-			//summary: inflight check function to see if IO finished.
+		_ioCheck: function(dfd){
+			// summary:
+			//		inflight check function to see if IO finished.
+			// dfd: Deferred
 			var ioArgs = dfd.ioArgs;
 			//Check for finished jsonp
 			if(ioArgs.json || (ioArgs.scriptLoaded && !ioArgs.args.checkString)){
@@ -225,9 +195,10 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 
 		},
 
-		_resHandle: function(/*Deferred*/dfd){
-			//summary: inflight function to handle a completed response.
-			if(dojo.io.script._ioCheck(dfd)){
+		_resHandle: function(/*Deferred*/ dfd){
+			// summary:
+			//		inflight function to handle a completed response.
+			if(script._ioCheck(dfd)){
 				dfd.callback(dfd);
 			}else{
 				//This path should never happen since the only way we can get
@@ -236,21 +207,43 @@ dojo.declare("dojo.io.script.__ioArgs", dojo.__IoArgs, {
 			}
 		},
 
-		_canAttach: function(/*Object*/ioArgs){
-			//summary: A method that can be overridden by other modules
-			//to control when the script attachment occurs.
+		_canAttach: function(/*===== ioArgs =====*/ ){
+			// summary:
+			//		A method that can be overridden by other modules
+			//		to control when the script attachment occurs.
+			// ioArgs: Object
 			return true;
 		},
 
-		_jsonpCallback: function(/*JSON Object*/json){
-			//summary:
+		_jsonpCallback: function(/*JSON Object*/ json){
+			// summary:
 			//		generic handler for jsonp callback. A pointer to this function
 			//		is used for all jsonp callbacks.  NOTE: the "this" in this
 			//		function will be the Deferred object that represents the script
 			//		request.
 			this.ioArgs.json = json;
+			kernel.global[_script._callbacksProperty][this.ioArgs.requestId](json);
 		}
 	};
 
-	return dojo.io.script;
+	lang.setObject("dojo.io.script", script);
+
+	/*=====
+	script.attach = function(id, url, frameDocument){
+		// summary:
+		//		creates a new `<script>` tag pointing to the specified URL and
+		//		adds it to the document.
+		// description:
+		//		Attaches the script element to the DOM. Use this method if you
+		//		just want to attach a script to the DOM and do not care when or
+		//		if it loads.
+	};
+	script.remove = function(id, frameDocument){
+		// summary:
+		//		removes the script element with the given id, from the given frameDocument.
+		//		If no frameDocument is passed, the current document is used.
+	};
+	=====*/
+
+	return script;
 });