admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed DelayedFunctionScheduler IE 8 compatibility issue

Browse Source
This commit is contained in:
Steve Gravrock
2018-01-02 18:17:23 -08:00
parent f69949ebc0
commit cb6de64e58
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jasmine-core/jasmine.js
View File

@@ -54,7 +54,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
j$.MockDate = jRequire.MockDate(); j$.MockDate = jRequire.MockDate();
j$.getClearStack = jRequire.clearStack(j$); j$.getClearStack = jRequire.clearStack(j$);
j$.Clock = jRequire.Clock(); j$.Clock = jRequire.Clock();
j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$);
j$.Env = jRequire.Env(j$); j$.Env = jRequire.Env(j$);
j$.ExceptionFormatter = jRequire.ExceptionFormatter(); j$.ExceptionFormatter = jRequire.ExceptionFormatter();
j$.Expectation = jRequire.Expectation(); j$.Expectation = jRequire.Expectation();
@@ -2059,7 +2059,7 @@ getJasmineRequireObj().Clock = function() {
return Clock; return Clock;
}; };
getJasmineRequireObj().DelayedFunctionScheduler = function() { getJasmineRequireObj().DelayedFunctionScheduler = function(j$) {
function DelayedFunctionScheduler() { function DelayedFunctionScheduler() {
var self = this; var self = this;
var scheduledLookup = []; var scheduledLookup = [];
@@ -2201,7 +2201,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
}); });
forEachFunction(funcsToRun, function(funcToRun) { forEachFunction(funcsToRun, function(funcToRun) {
if (deletedKeys.indexOf(funcToRun.timeoutKey) !== -1) { if (j$.util.arrayContains(deletedKeys, funcToRun.timeoutKey)) {
// skip a timeoutKey deleted whilst we were running // skip a timeoutKey deleted whilst we were running
return; return;
} }

4
src/core/DelayedFunctionScheduler.js
View File

@@ -1,4 +1,4 @@
getJasmineRequireObj().DelayedFunctionScheduler = function() { getJasmineRequireObj().DelayedFunctionScheduler = function(j$) {
function DelayedFunctionScheduler() { function DelayedFunctionScheduler() {
var self = this; var self = this;
var scheduledLookup = []; var scheduledLookup = [];
@@ -140,7 +140,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
}); });
forEachFunction(funcsToRun, function(funcToRun) { forEachFunction(funcsToRun, function(funcToRun) {
if (deletedKeys.indexOf(funcToRun.timeoutKey) !== -1) { if (j$.util.arrayContains(deletedKeys, funcToRun.timeoutKey)) {
// skip a timeoutKey deleted whilst we were running // skip a timeoutKey deleted whilst we were running
return; return;
} }

2
src/core/requireCore.js
View File

@@ -32,7 +32,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
j$.MockDate = jRequire.MockDate(); j$.MockDate = jRequire.MockDate();
j$.getClearStack = jRequire.clearStack(j$); j$.getClearStack = jRequire.clearStack(j$);
j$.Clock = jRequire.Clock(); j$.Clock = jRequire.Clock();
j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(); j$.DelayedFunctionScheduler = jRequire.DelayedFunctionScheduler(j$);
j$.Env = jRequire.Env(j$); j$.Env = jRequire.Env(j$);
j$.ExceptionFormatter = jRequire.ExceptionFormatter(); j$.ExceptionFormatter = jRequire.ExceptionFormatter();
j$.Expectation = jRequire.Expectation(); j$.Expectation = jRequire.Expectation();