Merge remote-tracking branch 'upstream/master'

1 files changed, 66 insertions, 0 deletions

diff --git a/lib/dojo/rpc/JsonpService.js.uncompressed.js b/lib/dojo/rpc/JsonpService.js.uncompressed.js
new file mode 100644
index 000000000..673a68c37
--- /dev/null
+++ b/lib/dojo/rpc/JsonpService.js.uncompressed.js
@@ -0,0 +1,66 @@
+define("dojo/rpc/JsonpService", [
+	"../_base/array", "../_base/declare", "../_base/lang", "./RpcService", "../io/script"],
+	function(array, declare, lang, RpcService, script){
+
+// module:
+//		dojo/rpc/JsonpService
+
+return declare("dojo.rpc.JsonpService", RpcService, {
+	// summary:
+	//		Generic JSONP service.  Minimally extends RpcService to allow
+	//		easy definition of nearly any JSONP style service. Example
+	//		SMD files exist in dojox.data
+
+	constructor: function(args, requiredArgs){
+		if(this.required){
+			if(requiredArgs){
+				lang.mixin(this.required, requiredArgs);
+			}
+
+			array.forEach(this.required, function(req){
+				if(req=="" || req==undefined){
+					throw new Error("Required Service Argument not found: "+req);
+				}
+			});
+		}
+	},
+
+	strictArgChecks: false,
+
+	bind: function(method, parameters, deferredRequestHandler, url){
+		// summary:
+		//		JSONP bind method. Takes remote method, parameters,
+		//		deferred, and a url, calls createRequest to make a JSON-RPC
+		//		envelope and passes that off with bind.
+		// method: string
+		//		The name of the method we are calling
+		// parameters: array
+		//		The parameters we are passing off to the method
+		// deferredRequestHandler: deferred
+		//		The Deferred object for this particular request
+
+		var def = script.get({
+			url: url||this.serviceUrl,
+			callbackParamName: this.callbackParamName||"callback",
+			content: this.createRequest(parameters),
+			timeout: this.timeout,
+			handleAs: "json",
+			preventCache: true
+		});
+		def.addCallbacks(this.resultCallback(deferredRequestHandler), this.errorCallback(deferredRequestHandler));
+	},
+
+	createRequest: function(parameters){
+		// summary:
+		//		create a JSONP req
+		// params: array
+		//		The array of parameters for this request;
+
+		var params = (lang.isArrayLike(parameters) && parameters.length==1) ?
+				parameters[0] : {};
+		lang.mixin(params,this.required);
+		return params;
+	}
+});
+
+});