Changeset 2771 for lang/javascript/jsdeferred

Timestamp:

12/07/07 14:51:55 (13 months ago)

Author:

cho45

Message:

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

with つかうほうがよさそう。
グローバルへエクスポートしてしまうと Safari とかでインセキュアになりそう

Location:

lang/javascript/jsdeferred/trunk

Files:

• Rakefile (modified) (1 diff)
• binding/userscript.js (modified) (2 diffs)
• 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:: var Deferred = D().define();"
+                f.puts "// Usage:: with (D()) { your code }"
                 f << mini(File.read("binding/userscript.js").sub("/*include JSDeferred*/", File.read("jsdeferred.js")), true)
         }

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

@@ +1 @@
+function D () {
+/*include JSDeferred*/
+
 /* function xhttp (opts) //=> Deferred
  * Cross site version of `http`.
@@ -49 +52 @@
 http.post = function (url, data) { return http({method:"post", url:url, data:data}) }
 
-function D () {
-
-/*include JSDeferred*/
-
+Deferred.Deferred = Deferred;
+Deferred.http     = http;
+Deferred.xhttp    = xhttp;
 return Deferred;
 }

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

@@ -2 +2 @@
 // JSDefeered (c) Copyright (c) 2007 cho45 ( www.lowreal.net )
 // See http://coderepos.org/share/wiki/JSDeferred
-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) {
-        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 () {
-
 
 
@@ -195 +165 @@
 
 
+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) {
+        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}) }
+
+Deferred.Deferred = Deferred;
+Deferred.http     = http;
+Deferred.xhttp    = xhttp;
 return Deferred;
 }