Changeset 2761 for lang/javascript/jsdeferred

Timestamp:

12/07/07 13:12:07 (13 months ago)

Author:

cho45

Message:

lang/javascript/jsdeferred/trunk/Rakefile,
lang/javascript/jsdeferred/trunk/jsdeferred.mini.js,
lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js,
lang/javascript/jsdeferred/trunk/jsdeferred.js,
lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js,
lang/javascript/jsdeferred/trunk/binding/userscript.js,
lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js:

define() が Deferred をかえすように。
userscript 用に http のユーティリティを追加

Location:

lang/javascript/jsdeferred/trunk

Files:

• Rakefile (modified) (1 diff)
• binding/userscript.js (modified) (1 diff)
• jsdeferred.jquery.js (modified) (1 diff)
• jsdeferred.js (modified) (1 diff)
• jsdeferred.mini.js (modified) (1 diff)
• jsdeferred.nodoc.js (modified) (1 diff)
• jsdeferred.userscript.js (modified) (2 diffs)

lang/javascript/jsdeferred/trunk/Rakefile

@@ -90 +90 @@
 file "jsdeferred.userscript.js" => ["jsdeferred.js", "binding/userscript.js"] do |t|
         File.open(t.name, "w") {|f|
-                f.puts "// Usage:: D().define();"
+                f.puts "// Usage:: var Deferred = D().define();"
                 f << File.read("binding/userscript.js").sub("/*include JSDeferred*/", mini(File.read("jsdeferred.js"), true))
         }

lang/javascript/jsdeferred/trunk/binding/userscript.js

@@ +1 @@
+/* function xhttp (opts) //=> Deferred
+ * Cross site version of `http`.
+ */
+/* function xhttp.get (url) //=> Deferred
+ */
+/* function xhttp.post (url, data) //=> Deferred
+ */
+function xhttp (opts) {
+        var d = Deferred();
+        if (opts.onload)  d = d.next(opts.onload);
+        if (opts.onerror) d = d.error(opts.onerror);
+        opts.onload = function (res) {
+                d.call(res);
+        };
+        opts.onerror = function (res) {
+                d.fail(res);
+        };
+        GM_xmlhttpRequest(opts);
+        return d;
+}
+xhttp.get  = function (url)       { return xhttp({method:"get", url:url}) }
+xhttp.post = function (url, data) { return xhttp({method:"post", url:url, data:data}) }
+
+/* function http (opts) //=> Deferred
+ * Sample:
+ *     http.get("http://example.com/hogehoge")
+ *     .next(function (a) {
+ *         log(a.responseText);
+ *     })
+ *     .error(function (e) {
+ *         log("error", e);
+ *     });
+ */
+/* function http.get (url) //=> Deferred
+ */
+/* function http.post (url, data) //=> Deferred
+ */
+function http (opts) {
+        var d = Deferred();
+        var req = new XMLHttpRequest();
+        req.open(opts.method, opts.url, true);
+        req.onreadystatechange = function () {
+                if (req.readyState == 4) d.call(req);
+        };
+        req.send(opts.data || null);
+        return d;
+}
+http.get  = function (url)       { return http({method:"get", url:url}) }
+http.post = function (url, data) { return http({method:"post", url:url, data:data}) }
+
 function D () {
 

lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js

@@ -69 +69 @@
 if(!list)list=["parallel","wait","next","call","loop"];if(!obj)obj=(function(){return this})();for(var i=0;i<list.length;i++){
 var n=list[i];obj[n]=Deferred[n];}
-};(function($){
+return Deferred;};(function($){
 $.deferred=Deferred;$.each(["get","getJSON","post"],function(n,i){
 var orig=$[i];$[i]=function(url,data,callback){

lang/javascript/jsdeferred/trunk/jsdeferred.js

@@ -340 +340 @@
                 obj[n] = Deferred[n];
         }
-};
-
+        return Deferred;
+};
+

lang/javascript/jsdeferred/trunk/jsdeferred.mini.js

@@ -69 +69 @@
 if(!list)list=["parallel","wait","next","call","loop"];if(!obj)obj=(function(){return this})();for(var i=0;i<list.length;i++){
 var n=list[i];obj[n]=Deferred[n];}
-};
+return Deferred;};

lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js

@@ -156 +156 @@
                 obj[n] = Deferred[n];
         }
+        return Deferred;
 };

lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js

@@ -1 @@
-// Usage:: D().define();
+// Usage:: var Deferred = D().define();
+/* function xhttp (opts) //=> Deferred
+ * Cross site version of `http`.
+ */
+/* function xhttp.get (url) //=> Deferred
+ */
+/* function xhttp.post (url, data) //=> Deferred
+ */
+function xhttp (opts) {
+        var d = Deferred();
+        if (opts.onload)  d = d.next(opts.onload);
+        if (opts.onerror) d = d.error(opts.onerror);
+        opts.onload = function (res) {
+                d.call(res);
+        };
+        opts.onerror = function (res) {
+                d.fail(res);
+        };
+        GM_xmlhttpRequest(opts);
+        return d;
+}
+xhttp.get  = function (url)       { return xhttp({method:"get", url:url}) }
+xhttp.post = function (url, data) { return xhttp({method:"post", url:url, data:data}) }
+
+/* function http (opts) //=> Deferred
+ * Sample:
+ *     http.get("http://example.com/hogehoge")
+ *     .next(function (a) {
+ *         log(a.responseText);
+ *     })
+ *     .error(function (e) {
+ *         log("error", e);
+ *     });
+ */
+/* function http.get (url) //=> Deferred
+ */
+/* function http.post (url, data) //=> Deferred
+ */
+function http (opts) {
+        var d = Deferred();
+        var req = new XMLHttpRequest();
+        req.open(opts.method, opts.url, true);
+        req.onreadystatechange = function () {
+                if (req.readyState == 4) d.call(req);
+        };
+        req.send(opts.data || null);
+        return d;
+}
+http.get  = function (url)       { return http({method:"get", url:url}) }
+http.post = function (url, data) { return http({method:"post", url:url, data:data}) }
+
 function D () {
 
@@ -159 +209 @@
                 obj[n] = Deferred[n];
         }
+        return Deferred;
 };