Merge branch 'master' of github.com:kriskowal/q

zumot · May 16, 2012 · c0991dc · c0991dc
2 parents 37cced8 + 02241ea
commit c0991dc
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 23 deletions.
diff --git a/lib/jasmine-promise.js b/lib/jasmine-promise.js
@@ -16,6 +16,7 @@ jasmine.Block.prototype.execute = function (onComplete) {
         }
     } catch (error) {
         spec.fail(error);
+        onComplete();
     }
 };
 
diff --git a/q-spec.html b/q-spec.html
@@ -1,22 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <html>
 <head>
     <title>Jasmine Spec Runner</title>
 
-    <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.2.0/jasmine_favicon.png">
-    <link rel="stylesheet" type="text/css" href="lib/jasmine-1.2.0/jasmine.css">
-    <script type="text/javascript" src="lib/jasmine-1.2.0/jasmine.js"></script>
-    <script type="text/javascript" src="lib/jasmine-1.2.0/jasmine-html.js"></script>
-    <script type="text/javascript" src="lib/jasmine-promise.js"></script>
+    <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.2.0/jasmine_favicon.png" />
+    <link rel="stylesheet" href="lib/jasmine-1.2.0/jasmine.css" />
+    <script src="lib/jasmine-1.2.0/jasmine.js"></script>
+    <script src="lib/jasmine-1.2.0/jasmine-html.js"></script>
+    <script src="lib/jasmine-promise.js"></script>
 
     <!-- include source files here... -->
-    <script type="text/javascript" src="q.js"></script>
+    <script src="q.js"></script>
 
     <!-- include spec files here... -->
-    <script type="text/javascript" src="q-spec.js"></script>
+    <script src="q-spec.js"></script>
 
-    <script type="text/javascript">
+    <script>
         (function() {
             var jasmineEnv = jasmine.getEnv();
             jasmineEnv.updateInterval = 1000;

diff --git a/q-spec.js b/q-spec.js
@@ -285,7 +285,7 @@ describe("promises for functions", function () {
             return bound()
             .then(function (_result) {
                 expect(_result).toBe(result);
-            })
+            });
         });
 
         it("returns a rejected promise from a thrown error", function () {
@@ -298,7 +298,7 @@ describe("promises for functions", function () {
                 expect("flying pigs").toBe("swillin' pigs");
             }, function (_exception) {
                 expect(_exception).toBe(exception);
-            })
+            });
         });
 
         it("passes arguments through", function () {
@@ -436,7 +436,7 @@ describe("propagation", function () {
         .then()
         .then(function (ten) {
             expect(ten).toBe(10);
-        })
+        });
     });
 
     it("propagate through then with modifying callback", function () {
@@ -446,19 +446,19 @@ describe("propagation", function () {
         })
         .then(function (twen) {
             expect(twen).toBe(20);
-        })
+        });
     });
 
     it("errback recovers from exception", function () {
-        var error = new Error("Bah!")
+        var error = new Error("Bah!");
         return Q.reject(error)
         .then(null, function (_error) {
             expect(_error).toBe(error);
             return 10;
         })
         .then(function (value) {
             expect(value).toBe(10);
-        })
+        });
     });
 
     it("rejection propagates through then with no errback", function () {
@@ -528,7 +528,7 @@ describe("allResolved", function () {
         return Q.allResolved([1, Q.resolve(2), Q.reject(3)])
         .then(null, function () {
             expect("flying pigs").toBe("flightless pigs");
-        })
+        });
     });
 
     it("the state and quantity of promises to be correct", function () {
@@ -550,7 +550,7 @@ describe("allResolved", function () {
 
             expect(promises[0].valueOf()).toEqual(1);
             expect(promises[1].valueOf()).toEqual(2);
-        })
+        });
     });
 
     it("is resolved after every constituent promise is resolved", function () {
@@ -567,13 +567,13 @@ describe("allResolved", function () {
         .then(function () {
             toResolve.resolve();
             resolved = true;
-        })
+        });
 
         return Q.allResolved(promises)
         .then(function (promises) {
             expect(resolved).toBe(true);
             expect(rejected).toBe(true);
-        })
+        });
     });
 
 });
@@ -648,7 +648,7 @@ describe("node support", function () {
             return Q.napply(subject.foo, subject, [])
             .then(function (result) {
                 expect(result).toBe(true);
-            })
+            });
         });
 
         it("rejects with callback error", function () {
@@ -684,7 +684,7 @@ describe("node support", function () {
             return Q.ncall(subject.foo, subject)
             .then(function (result) {
                 expect(result).toBe(true);
-            })
+            });
         });
 
         it("rejects with callback error", function () {

diff --git a/q.js b/q.js
@@ -115,7 +115,8 @@ if (typeof process !== "undefined") {
     nextTick = process.nextTick;
 } else if (typeof msSetImmediate === "function") {
     // IE 10 only, at the moment
-    nextTick = msSetImmediate;
+    // And yes, ``bind``ing to ``window`` is necessary O_o.
+    nextTick = msSetImmediate.bind(window);
 } else if (typeof setImmediate === "function") {
     // https://github.com/NobleJS/setImmediate
     nextTick = setImmediate;