Merge branch 'master' into 3.0-features

2018-02-02 16:33:38 -08:00
parent 42e00b3bc5 70bce55721
commit 274011ed03
15 changed files with 543 additions and 206 deletions
--- a/src/core/DelayedFunctionScheduler.js
+++ b/src/core/DelayedFunctionScheduler.js
@@ -124,6 +124,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function(j$) {
      }

      do {
+        deletedKeys = [];
        var newCurrentTime = scheduledLookup.shift();
        tickDate(newCurrentTime - currentTime);