Changeset 2635 for lang/javascript/jsdeferred

Timestamp:

12/06/07 17:18:28 (13 months ago)

Author:

cho45

Message:

lang/javascript/jsdeferred/trunk/test.html,
lang/javascript/jsdeferred/trunk/sample.html,
lang/javascript/jsdeferred/trunk/jsdeferred.js,
lang/javascript/jsdeferred/trunk/binding,
lang/javascript/jsdeferred/trunk/binding/jquery.js:

jQuery 部分を分離

Location:

lang/javascript/jsdeferred/trunk

Files:

• binding (added)
• binding/jquery.js (added)
• jsdeferred.js (modified) (10 diffs)
• sample.html (modified) (3 diffs)
• test.html (modified) (2 diffs)

lang/javascript/jsdeferred/trunk/jsdeferred.js

@@ -23 +23 @@
  * THE SOFTWARE.
  */
-(function ($) {
-/* Usage::
+/* Usage (with jQuery)::
  *
  *     $.deferred.define();
@@ -52 +51 @@
  *
  * Sample:
- *     var d = new $.deferred(); //=> new Deferred;
+ *     var d = new Deferred();
  *     // or this is shothand of above.
- *     var d = $.deferred();
+ *     var d = Deferred();
  */
 /* function Deferred.prototype.next   (fun) //=> Deferred
@@ -126 +125 @@
 };
 
-/* function Deferred.register (name, fun) //=> void 0
- *
- * Register `fun` to Deferred prototype for method chain.
- *
- * Sample::
- *     // Deferred.register("loop", loop);
- *
- *     // Global Deferred function
- *     loop(10, function (n) {
- *         print(n);
- *     }).
- *     // Registered Deferred.prototype.loop
- *     loop(10, function (n) {
- *         print(n);
- *     });
- */
-Deferred.register = function (name, fun) {
-        this.prototype[name] = function () {
-                return this.next(Deferred.wrap(fun).apply(null, arguments));
-        };
-};
-
-/* function Deferred.wrap (dfun) //=> Function
- *
- * Create and return function which run `dfun` with arguments.
- *
- * Sample::
- *     var dloop = Deferred.wrap(loop);
- *
- *     next(dloop(10, function (n) {
- *         print(n);
- *     }));
- */
-Deferred.wrap = function (dfun) {
-        return function () {
-                var a = arguments;
-                return function () {
-                        return dfun.apply(null, a);
-                };
-        };
-};
-
 /* function parallel (deferredlist) //=> Deferred
  *
@@ -192 +149 @@
  *     });
  */
-function parallel (dl) {
+Deferred.parallel = function (dl) {
         var ret = new Deferred(), values = {}, num = 0;
         for (var i in dl) {
@@ -226 +183 @@
  *     });
  */
-function wait (n) {
+Deferred.wait = function (n) {
         var d = new Deferred(), t = new Date();
         var id = setTimeout(function () {
@@ -235 +192 @@
         return d;
 }
-Deferred.register("wait", wait);
 
 /* function next (fun) //=> Deferred
@@ -242 +198 @@
  * is called after current queue.
  */
-function next (fun) {
+Deferred.next = function (fun) {
         var d = new Deferred();
         var id = setTimeout(function () { clearTimeout(id); d.call() }, 0);
@@ -271 +227 @@
  *
  */
-function call (f, args) {
+Deferred.call = function (f, args) {
         args = Array.prototype.slice.call(arguments);
         f    = args.shift();
@@ -297 +253 @@
  *     });
  */
-function loop (n, fun) {
+Deferred.loop = function (n, fun) {
         var o = {
                 begin : n.begin || 0,
@@ -330 +286 @@
         });
 }
-Deferred.register("loop", loop);
-
-$.deferred          = Deferred;
-$.deferred.parallel = parallel;
-$.deferred.wait     = wait;
-$.deferred.next     = next;
-$.deferred.call     = call;
-$.deferred.loop     = loop;
-$.deferred.define   = function (obj, list) {
+
+/* function Deferred.register (name, fun) //=> void 0
+ *
+ * Register `fun` to Deferred prototype for method chain.
+ *
+ * Sample::
+ *     // Deferred.register("loop", loop);
+ *
+ *     // Global Deferred function
+ *     loop(10, function (n) {
+ *         print(n);
+ *     }).
+ *     // Registered Deferred.prototype.loop
+ *     loop(10, function (n) {
+ *         print(n);
+ *     });
+ */
+Deferred.register = function (name, fun) {
+        this.prototype[name] = function () {
+                return this.next(Deferred.wrap(fun).apply(null, arguments));
+        };
+};
+
+/* function Deferred.wrap (dfun) //=> Function
+ *
+ * Create and return function which run `dfun` with arguments.
+ *
+ * Sample::
+ *     var dloop = Deferred.wrap(loop);
+ *
+ *     next(dloop(10, function (n) {
+ *         print(n);
+ *     }));
+ */
+Deferred.wrap = function (dfun) {
+        return function () {
+                var a = arguments;
+                return function () {
+                        return dfun.apply(null, a);
+                };
+        };
+};
+
+Deferred.register("loop", Deferred.loop);
+Deferred.register("wait", Deferred.wait);
+
+Deferred.define = function (obj, list) {
         if (!list) list = ["parallel", "wait", "next", "call", "loop"];
         if (!obj)  obj  = (function () { return this })();
-        $.each(list, function (n, i) {
-                obj[i] = $.deferred[i];
-        });
+        for (var i = 0; i < list.length; i++) {
+                var n = list[i];
+                obj[n] = Deferred[n];
+        }
 };
 
-// override jQuery Ajax functions
-$.each(["get", "getJSON", "post"], function (n, i) {
-        var orig = $[i];
-        $[i] = function (url, data, callback) {
-                if (typeof data == "function") {
-                        data = undefined;
-                        callback = data;
-                }
-                var d = $.deferred();
-                orig(url, data, function (data) {
-                        d.call(data);
-                });
-                if (callback) d = d.next(callback);
-                return d;
-        };
-});
-
-// end
-})(jQuery);

lang/javascript/jsdeferred/trunk/sample.html

@@ -2 +2 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
         <head>
-                <title>jQuery Deferred Sample</title>
+                <title>JSDeferred Sample</title>
                 
                 <script type="text/javascript" src="http://coderepos.org/share/htdocs/lib/jquery-1.2.1.min.js"></script>
                 <script type="text/javascript" src="jsdeferred.js"></script>
+                <script type="text/javascript" src="binding/jquery.js"></script>
                 <script type="text/javascript">
                         // <![CDATA[
-                        $.deferred.define();
-
 
                         // ]]>
@@ -57 +56 @@
         <body>
                 <div id="whole">
-                        <h1 id="top">jQuery Deferred Sample</h1>
+                        <h1 id="top">JSDeferred Sample</h1>
                         <p>About Deferred: <a href="http://mochikit.com/doc/html/MochiKit/Async.html">MochiKit.Async</a></p>
                         <p>Deferred is able to write async code cleanly.</p>
@@ -70 +69 @@
                                         <pre>
 // export functions to global;
-$.deferred.define();
+Deferred.define();
 
 // export to aObj
-// $.deferred.define(aObj);
+// Deferred.define(aObj);
 
 // export specic functions
 // var global = (function () { return this })();
-// $.deferred.define(global, ["next"]);
+// Deferred.define(global, ["next"]);
 
 // full name
-$.deferred.next(fun);
+Deferred.next(fun);
 </pre>
                                 </div>

lang/javascript/jsdeferred/trunk/test.html

@@ -2 +2 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
         <head>
-                <title>jQuery Deferred Test</title>
+                <title>JSDeferred Test</title>
                 
                 <script type="text/javascript" src="http://coderepos.org/share/htdocs/lib/jquery-1.2.1.min.js"></script>
                 <script type="text/javascript" src="jsdeferred.js"></script>
+                <script type="text/javascript" src="binding/jquery.js"></script>
                 <script type="text/javascript" src="test-jsdeferred.js"></script>
                 <style type="text/css">
@@ -90 +91 @@
         <body>
                 <div id="whole">
-                        <h1 id="top">jQuery Deferred Test <span id="nums">0/0</span></h1>
+                        <h1 id="top">JSDeferred Test <span id="nums">0/0</span></h1>
 
                         <div id="content">