Review fixes

matrix-org · Jan 20, 2017 · b80e207 · b80e207
1 parent 501b949
commit b80e207
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/spec/mock-request.js b/spec/mock-request.js
@@ -1,13 +1,12 @@
 "use strict";
 const q = require("q");
-let clock = jasmine.Clock;
 let fakeDate;
 let callbacks = require("../lib/realtime-callbacks");
 
 let tick = function tick(millis) {
     // make sure we tick the fakedate first, otherwise nothing will happen!
     fakeDate += millis;
-    clock.tick(millis);
+    jasmine.Clock.tick(millis);
 };
 
 
@@ -59,7 +58,7 @@ HttpBackend.prototype = {
         );
         // Mock out Clock for .timeout() tests
         if (this.useMockClock) {
-            clock.useMock();
+            jasmine.Clock.useMock();
             fakeDate = Date.now();
             callbacks.setNow(function() {
                 return fakeDate;

diff --git a/spec/unit/http-api.spec.js b/spec/unit/http-api.spec.js
@@ -7,18 +7,17 @@ const TimeoutContext = HttpApi.__TimeoutContext;
 
 describe("Http-Api", function() {
     describe("TimeoutContext", function() {
-        const clock = jasmine.Clock;
         let fakeDate;
 
         function tick(millis) {
             // make sure we tick the fakedate first, otherwise nothing will happen!
             fakeDate += millis;
-            clock.tick(millis);
+            jasmine.Clock.tick(millis);
         }
 
         beforeEach(function() {
             testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
-            clock.useMock();
+            jasmine.Clock.useMock();
             fakeDate = Date.now();
             callbacks.setNow(function() {
                 return fakeDate;

diff --git a/src/http-api.js b/src/http-api.js
@@ -105,7 +105,7 @@ const TimeoutContext = function TimeoutContext(timeoutFunction, waitMs) {
 module.exports.__TimeoutContext = TimeoutContext;
 
 TimeoutContext.prototype.onProgressCheck = function(progressEvent) {
-    if (this.lastLoaded || progressEvent.loaded > this.lastLoaded) {
+    if (this.lastLoaded === null || progressEvent.loaded > this.lastLoaded) {
         callbacks.debounce(this.jobName);
         this.lastLoaded = progressEvent.loaded;
     }
@@ -703,7 +703,6 @@ module.exports.MatrixHttpApi.prototype = {
                 function(err, response, body) {
                     if (timeoutContext) {
                         timeoutContext.stop();
-                        delete req.onprogres;
                         if (timedOut) {
                             return; // already rejected promise
                         }
@@ -721,7 +720,7 @@ module.exports.MatrixHttpApi.prototype = {
                 }
             );
             if (timeoutContext) {
-                req.onprogress = timeoutContext.onProgressCheck;
+                req.onprogress = timeoutContext.onProgressCheck.bind(this);
                 timeoutContext.start();
             }
             if (req && req.abort) {

diff --git a/src/realtime-callbacks.js b/src/realtime-callbacks.js
@@ -72,7 +72,7 @@ class Debouncer {
 
     start(func, waitMs) {
         if (func) this.func = func;
-        if (!isNaN(waitMs)) this.waitMs = waitMs;
+        if (waitMs > 0) this.waitMs = waitMs;
         this.timeoutId = exports.setTimeout(this.complete.bind(this), this.waitMs);
     }