Merge branch 'master' into add-counters

Author: rwjblue

ember-cli-build.js

@@ -78,7 +78,7 @@ module.exports = function (app) {
         }]
       }
     }),
-    new Funnel(path.dirname(require.resolve('qunitjs')), {
+    new Funnel(path.dirname(require.resolve('qunit')), {
       annotation: 'tests/qunit.{js,css}',
       destDir: 'tests',
       files: ['qunit.css', 'qunit.js']

lib/index.ts

@@ -158,9 +158,7 @@ export default class Backburner {
 
     this._platform = platform;
 
-    this._boundRunExpiredTimers = () => {
-      this._runExpiredTimers();
-    };
+    this._boundRunExpiredTimers = this._runExpiredTimers.bind(this);
 
     this._boundAutorunEnd = () => {
       autorunsCompletedCount++;
@@ -586,9 +584,10 @@ export default class Backburner {
 
   public cancel(timer?) {
     cancelCount++;
-    if (!timer) { return false; }
+                
+    if (timer === undefined || timer === null) { return false; }
+                
     let timerType = typeof timer;
-
     if (timerType === 'number') { // we're cancelling a throttle or debounce
       return this._cancelItem(timer, this._throttlers) || this._cancelItem(timer, this._debouncees);
     } else if (timerType === 'string') { // we're cancelling a setTimeout
@@ -653,18 +652,16 @@ export default class Backburner {
     if (this._timers.length === 0) {
       this._timers.push(executeAt, id, target, method, args, stack);
       this._installTimerTimeout();
-      return id;
-    }
-
-    // find position to insert
-    let i = searchTimer(executeAt, this._timers);
-    this._timers.splice(i, 0, executeAt, id, target, method, args, stack);
+    } else {
+      // find position to insert
+      let i = searchTimer(executeAt, this._timers);
+      this._timers.splice(i, 0, executeAt, id, target, method, args, stack);
 
-    // we should be the new earliest timer if i == 0
-    if (i === 0) {
-      this._reinstallTimerTimeout();
+      // we should be the new earliest timer if i == 0
+      if (i === 0) {
+        this._reinstallTimerTimeout();
+      }
     }
-
     return id;
   }
 
@@ -716,10 +713,11 @@ export default class Backburner {
 
   private _runExpiredTimers() {
     this._timerTimeoutId = null;
-    if (this._timers.length === 0) { return; }
-    this.begin();
-    this._scheduleExpiredTimers();
-    this.end();
+    if (this._timers.length > 0) {
+      this.begin();
+      this._scheduleExpiredTimers();
+      this.end();
+    }
   }
 
   private _scheduleExpiredTimers() {
@@ -731,15 +729,13 @@ export default class Backburner {
 
     for (; i < l; i += 6) {
       let executeAt = timers[i];
-      if (executeAt <= n) {
-        let target = timers[i + 2];
-        let method = timers[i + 3];
-        let args = timers[i + 4];
-        let stack = timers[i + 5];
-        this.currentInstance!.schedule(defaultQueue, target, method, args, false, stack);
-      } else {
-        break;
-      }
+      if (executeAt > n) { break; }
+
+      let target = timers[i + 2];
+      let method = timers[i + 3];
+      let args = timers[i + 4];
+      let stack = timers[i + 5];
+      this.currentInstance!.schedule(defaultQueue, target, method, args, false, stack);
     }
 
     timers.splice(0, i);

package.json

@@ -27,13 +27,13 @@
     "broccoli-merge-trees": "^2.0.0",
     "broccoli-rollup": "^2.0.0",
     "broccoli-typescript-compiler": "^2.1.1",
-    "do-you-even-bench": "^1.0.2",
+    "do-you-even-bench": "^1.0.5",
     "ember-cli": "^3.0.0-beta.2",
     "ember-cli-dependency-checker": "^2.1.0",
     "ember-cli-inject-live-reload": "1.7.0",
-    "glob": "^7.1.1",
-    "loader.js": "^4.4.1",
-    "qunitjs": "^2.4.1",
+    "glob": "^7.1.2",
+    "loader.js": "^4.6.0",
+    "qunit": "^2.5.0",
     "rollup-plugin-buble": "^0.18.0",
     "tslint": "^5.9.1"
   }

tests/debounce-test.ts

@@ -545,7 +545,6 @@ QUnit.test('debounce within a debounce can be canceled GH#183', function(assert)
   let done = assert.async();
   let bb = new Backburner(['zomg']);
 
-  let steps: string[] = [];
   let foo = () => {
     assert.ok(true, 'foo called');
     return bb.debounce(bar, 10);