Changeset 2648 for lang/javascript/jsdeferred

Timestamp:

12/06/07 18:23:16 (13 months ago)

Author:

cho45

Message:

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

テストの更新

Location:

lang/javascript/jsdeferred/trunk

Files:

• binding/jquery.js (modified) (1 diff)
• test-jsdeferred.js (modified) (4 diffs)

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

@@ -1 +1 @@
 (function ($) {
-        $.deferred          = Deferred;
-
+        $.deferred = Deferred;
         // override jQuery Ajax functions
         $.each(["get", "getJSON", "post"], function (n, i) {

lang/javascript/jsdeferred/trunk/test-jsdeferred.js

@@ -63 +63 @@
 // ::Test::Start::
 
-$.deferred.define();
+Deferred.define();
 
 msg("Loaded "+testfuns.length+" tests;");
@@ -69 +69 @@
 msg("Basic Tests::");
 
-expect("new $.deferred()", true, (new $.deferred()) instanceof $.deferred);
+expect("new Deferred", true, (new Deferred) instanceof Deferred);
+expect("Deferred()",   true,     Deferred() instanceof Deferred);
 
 var testobj = {};
-$.deferred.define(testobj);
-expect("define() next", $.deferred.next, testobj.next);
-expect("define() loop", $.deferred.loop, testobj.loop);
+Deferred.define(testobj);
+expect("define() next", Deferred.next, testobj.next);
+expect("define() loop", Deferred.loop, testobj.loop);
 
 var testobj = {};
-$.deferred.define(testobj, ["next"]);
-expect("define() next", $.deferred.next, testobj.next);
+Deferred.define(testobj, ["next"]);
+expect("define() next", Deferred.next, testobj.next);
 expect("define() loop (must not be exported)", undefined, testobj.loop);
-
-expect("$.get deferred",     true, $.get(".")     instanceof $.deferred);
-// expect//("$.post deferred",    true, $.post(".")    instanceof $.deferred);
-// comment out for svn web
-expect("$.getJSON deferred", true, $.getJSON(".") instanceof $.deferred);
-
 
 var d = next(function () {
@@ -92 +87 @@
 d.cancel();
 
-var d = $.deferred();
+var d = Deferred();
 d.callback.ok = function () {
         ng("Must not be called!!");
@@ -99 +94 @@
 d.call();
 
+msg("jQuery binding test")
+expect("$.get deferred",     true, $.get(".")     instanceof $.deferred);
+// expect//("$.post deferred",    true, $.post(".")    instanceof $.deferred);
+// comment out for svn web
+expect("$.getJSON deferred", true, $.getJSON(".") instanceof $.deferred);
 
 // Start Main Test