Skip to content
This repository was archived by the owner on Apr 20, 2018. It is now read-only.

Commit 46e93bf

Browse files
mattpodwysockimattpodwysocki
committed
Updating to 2.4.5
1 parent 87f70d3 commit 46e93bf

41 files changed

Lines changed: 274 additions & 333 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Gruntfile.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports = function (grunt) {
5151
'src/core/concurrency/scheduleperiodicrecursive.js',
5252
'src/core/concurrency/immediatescheduler.js',
5353
'src/core/concurrency/currentthreadscheduler.js',
54-
'src/core/concurrency/timeoutscheduler.js',
54+
'src/core/concurrency/defaultscheduler.js',
5555
'src/core/concurrency/catchscheduler.js',
5656
'src/core/notification.js',
5757
'src/core/enumerator.js',
@@ -346,7 +346,7 @@ module.exports = function (grunt) {
346346
'src/core/concurrency/scheduleperiodicrecursive.js',
347347
'src/core/concurrency/immediatescheduler.js',
348348
'src/core/concurrency/currentthreadscheduler.js',
349-
'src/core/concurrency/timeoutscheduler.js',
349+
'src/core/concurrency/defaultscheduler.js',
350350
'src/core/concurrency/catchscheduler.js',
351351
'src/core/notification.js',
352352
'src/core/enumerator.js',
@@ -638,7 +638,7 @@ module.exports = function (grunt) {
638638
'src/core/concurrency/scheduleperiodicrecursive.js',
639639
'src/core/concurrency/immediatescheduler.js',
640640
'src/core/concurrency/currentthreadscheduler.js',
641-
'src/core/concurrency/timeoutscheduler.js',
641+
'src/core/concurrency/defaultscheduler.js',
642642
'src/core/concurrency/catchscheduler.js',
643643
'src/core/notification.js',
644644
'src/core/enumerator.js',
@@ -785,7 +785,7 @@ module.exports = function (grunt) {
785785
'src/core/concurrency/scheduleperiodicrecursive.js',
786786
'src/core/concurrency/immediatescheduler.js',
787787
'src/core/concurrency/currentthreadscheduler.js',
788-
'src/core/concurrency/timeoutscheduler.js',
788+
'src/core/concurrency/defaultscheduler.js',
789789
'src/core/concurrency/catchscheduler.js',
790790
'src/core/notification.js',
791791
'src/core/enumerator.js',
@@ -933,7 +933,7 @@ module.exports = function (grunt) {
933933
'src/core/concurrency/immediatescheduler.js',
934934
'src/core/concurrency/currentthreadscheduler.js',
935935
'src/core/concurrency/scheduleperiodicrecursive.js',
936-
'src/core/concurrency/timeoutscheduler.js',
936+
'src/core/concurrency/defaultscheduler.js',
937937

938938
'src/core/notification.js',
939939
'src/core/enumerator.js',
@@ -1102,7 +1102,7 @@ module.exports = function (grunt) {
11021102
'src/core/concurrency/immediatescheduler.js',
11031103
'src/core/concurrency/currentthreadscheduler.js',
11041104
'src/core/concurrency/scheduleperiodicrecursive.js',
1105-
'src/core/concurrency/timeoutscheduler.js',
1105+
'src/core/concurrency/defaultscheduler.js',
11061106

11071107
'src/core/notification.js',
11081108
'src/core/enumerator.js',

‎dist/rx.all.compat.js‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,7 @@
14471447
}());
14481448

14491449
var scheduleMethod, clearMethod = noop;
1450+
14501451
var localTimer = (function () {
14511452
var localSetTimeout, localClearTimeout = noop;
14521453
if ('WScript' in this) {
@@ -1471,6 +1472,8 @@
14711472

14721473
(function () {
14731474

1475+
var taskId = 0, tasks = new Array(1000);
1476+
14741477
var reNative = RegExp('^' +
14751478
String(toString)
14761479
.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
@@ -1485,8 +1488,7 @@
14851488
function postMessageSupported () {
14861489
// Ensure not in a worker
14871490
if (!root.postMessage || root.importScripts) { return false; }
1488-
var isAsync = false,
1489-
oldHandler = root.onmessage;
1491+
var isAsync = false, oldHandler = root.onmessage;
14901492
// Test for async
14911493
root.onmessage = function () { isAsync = true; };
14921494
root.postMessage('', '*');
@@ -1502,17 +1504,14 @@
15021504
} else if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
15031505
scheduleMethod = process.nextTick;
15041506
} else if (postMessageSupported()) {
1505-
var MSG_PREFIX = 'ms.rx.schedule' + Math.random(),
1506-
tasks = {},
1507-
taskId = 0;
1507+
var MSG_PREFIX = 'ms.rx.schedule' + Math.random();
15081508

15091509
var onGlobalPostMessage = function (event) {
15101510
// Only if we're a match to avoid any other global events
15111511
if (typeof event.data === 'string' && event.data.substring(0, MSG_PREFIX.length) === MSG_PREFIX) {
1512-
var handleId = event.data.substring(MSG_PREFIX.length),
1513-
action = tasks[handleId];
1512+
var handleId = event.data.substring(MSG_PREFIX.length), action = tasks[handleId];
15141513
action();
1515-
delete tasks[handleId];
1514+
tasks[handleId] = undefined;
15161515
}
15171516
}
15181517

@@ -1528,20 +1527,17 @@
15281527
root.postMessage(MSG_PREFIX + currentId, '*');
15291528
};
15301529
} else if (!!root.MessageChannel) {
1531-
var channel = new root.MessageChannel(),
1532-
channelTasks = {},
1533-
channelTaskId = 0;
1530+
var channel = new root.MessageChannel();
15341531

15351532
channel.port1.onmessage = function (event) {
1536-
var id = event.data,
1537-
action = channelTasks[id];
1533+
var id = event.data, action = tasks[id];
15381534
action();
1539-
delete channelTasks[id];
1535+
tasks[id] = undefined;
15401536
};
15411537

15421538
scheduleMethod = function (action) {
1543-
var id = channelTaskId++;
1544-
channelTasks[id] = action;
1539+
var id = taskId++;
1540+
tasks[id] = action;
15451541
channel.port2.postMessage(id);
15461542
};
15471543
} else if ('document' in root && 'onreadystatechange' in root.document.createElement('script')) {
@@ -1582,11 +1578,8 @@
15821578
}
15831579

15841580
function scheduleRelative(state, dueTime, action) {
1585-
var scheduler = this,
1586-
dt = Scheduler.normalize(dueTime);
1587-
if (dt === 0) {
1588-
return scheduler.scheduleWithState(state, action);
1589-
}
1581+
var scheduler = this, dt = Scheduler.normalize(dueTime);
1582+
if (dt === 0) { return scheduler.scheduleWithState(state, action); }
15901583
var disposable = new SingleAssignmentDisposable();
15911584
var id = localSetTimeout(function () {
15921585
if (!disposable.isDisposed) {

‎dist/rx.all.compat.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.all.compat.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.all.js‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@
12561256
}());
12571257

12581258
var scheduleMethod, clearMethod = noop;
1259+
12591260
var localTimer = (function () {
12601261
var localSetTimeout, localClearTimeout = noop;
12611262
if ('WScript' in this) {
@@ -1280,6 +1281,8 @@
12801281

12811282
(function () {
12821283

1284+
var taskId = 0, tasks = new Array(1000);
1285+
12831286
var reNative = RegExp('^' +
12841287
String(toString)
12851288
.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
@@ -1294,8 +1297,7 @@
12941297
function postMessageSupported () {
12951298
// Ensure not in a worker
12961299
if (!root.postMessage || root.importScripts) { return false; }
1297-
var isAsync = false,
1298-
oldHandler = root.onmessage;
1300+
var isAsync = false, oldHandler = root.onmessage;
12991301
// Test for async
13001302
root.onmessage = function () { isAsync = true; };
13011303
root.postMessage('', '*');
@@ -1311,17 +1313,14 @@
13111313
} else if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
13121314
scheduleMethod = process.nextTick;
13131315
} else if (postMessageSupported()) {
1314-
var MSG_PREFIX = 'ms.rx.schedule' + Math.random(),
1315-
tasks = {},
1316-
taskId = 0;
1316+
var MSG_PREFIX = 'ms.rx.schedule' + Math.random();
13171317

13181318
var onGlobalPostMessage = function (event) {
13191319
// Only if we're a match to avoid any other global events
13201320
if (typeof event.data === 'string' && event.data.substring(0, MSG_PREFIX.length) === MSG_PREFIX) {
1321-
var handleId = event.data.substring(MSG_PREFIX.length),
1322-
action = tasks[handleId];
1321+
var handleId = event.data.substring(MSG_PREFIX.length), action = tasks[handleId];
13231322
action();
1324-
delete tasks[handleId];
1323+
tasks[handleId] = undefined;
13251324
}
13261325
}
13271326

@@ -1337,20 +1336,17 @@
13371336
root.postMessage(MSG_PREFIX + currentId, '*');
13381337
};
13391338
} else if (!!root.MessageChannel) {
1340-
var channel = new root.MessageChannel(),
1341-
channelTasks = {},
1342-
channelTaskId = 0;
1339+
var channel = new root.MessageChannel();
13431340

13441341
channel.port1.onmessage = function (event) {
1345-
var id = event.data,
1346-
action = channelTasks[id];
1342+
var id = event.data, action = tasks[id];
13471343
action();
1348-
delete channelTasks[id];
1344+
tasks[id] = undefined;
13491345
};
13501346

13511347
scheduleMethod = function (action) {
1352-
var id = channelTaskId++;
1353-
channelTasks[id] = action;
1348+
var id = taskId++;
1349+
tasks[id] = action;
13541350
channel.port2.postMessage(id);
13551351
};
13561352
} else if ('document' in root && 'onreadystatechange' in root.document.createElement('script')) {
@@ -1391,11 +1387,8 @@
13911387
}
13921388

13931389
function scheduleRelative(state, dueTime, action) {
1394-
var scheduler = this,
1395-
dt = Scheduler.normalize(dueTime);
1396-
if (dt === 0) {
1397-
return scheduler.scheduleWithState(state, action);
1398-
}
1390+
var scheduler = this, dt = Scheduler.normalize(dueTime);
1391+
if (dt === 0) { return scheduler.scheduleWithState(state, action); }
13991392
var disposable = new SingleAssignmentDisposable();
14001393
var id = localSetTimeout(function () {
14011394
if (!disposable.isDisposed) {

‎dist/rx.all.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.all.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.compat.js‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,7 @@
14471447
}());
14481448

14491449
var scheduleMethod, clearMethod = noop;
1450+
14501451
var localTimer = (function () {
14511452
var localSetTimeout, localClearTimeout = noop;
14521453
if ('WScript' in this) {
@@ -1471,6 +1472,8 @@
14711472

14721473
(function () {
14731474

1475+
var taskId = 0, tasks = new Array(1000);
1476+
14741477
var reNative = RegExp('^' +
14751478
String(toString)
14761479
.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
@@ -1485,8 +1488,7 @@
14851488
function postMessageSupported () {
14861489
// Ensure not in a worker
14871490
if (!root.postMessage || root.importScripts) { return false; }
1488-
var isAsync = false,
1489-
oldHandler = root.onmessage;
1491+
var isAsync = false, oldHandler = root.onmessage;
14901492
// Test for async
14911493
root.onmessage = function () { isAsync = true; };
14921494
root.postMessage('', '*');
@@ -1502,17 +1504,14 @@
15021504
} else if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
15031505
scheduleMethod = process.nextTick;
15041506
} else if (postMessageSupported()) {
1505-
var MSG_PREFIX = 'ms.rx.schedule' + Math.random(),
1506-
tasks = {},
1507-
taskId = 0;
1507+
var MSG_PREFIX = 'ms.rx.schedule' + Math.random();
15081508

15091509
var onGlobalPostMessage = function (event) {
15101510
// Only if we're a match to avoid any other global events
15111511
if (typeof event.data === 'string' && event.data.substring(0, MSG_PREFIX.length) === MSG_PREFIX) {
1512-
var handleId = event.data.substring(MSG_PREFIX.length),
1513-
action = tasks[handleId];
1512+
var handleId = event.data.substring(MSG_PREFIX.length), action = tasks[handleId];
15141513
action();
1515-
delete tasks[handleId];
1514+
tasks[handleId] = undefined;
15161515
}
15171516
}
15181517

@@ -1528,20 +1527,17 @@
15281527
root.postMessage(MSG_PREFIX + currentId, '*');
15291528
};
15301529
} else if (!!root.MessageChannel) {
1531-
var channel = new root.MessageChannel(),
1532-
channelTasks = {},
1533-
channelTaskId = 0;
1530+
var channel = new root.MessageChannel();
15341531

15351532
channel.port1.onmessage = function (event) {
1536-
var id = event.data,
1537-
action = channelTasks[id];
1533+
var id = event.data, action = tasks[id];
15381534
action();
1539-
delete channelTasks[id];
1535+
tasks[id] = undefined;
15401536
};
15411537

15421538
scheduleMethod = function (action) {
1543-
var id = channelTaskId++;
1544-
channelTasks[id] = action;
1539+
var id = taskId++;
1540+
tasks[id] = action;
15451541
channel.port2.postMessage(id);
15461542
};
15471543
} else if ('document' in root && 'onreadystatechange' in root.document.createElement('script')) {
@@ -1582,11 +1578,8 @@
15821578
}
15831579

15841580
function scheduleRelative(state, dueTime, action) {
1585-
var scheduler = this,
1586-
dt = Scheduler.normalize(dueTime);
1587-
if (dt === 0) {
1588-
return scheduler.scheduleWithState(state, action);
1589-
}
1581+
var scheduler = this, dt = Scheduler.normalize(dueTime);
1582+
if (dt === 0) { return scheduler.scheduleWithState(state, action); }
15901583
var disposable = new SingleAssignmentDisposable();
15911584
var id = localSetTimeout(function () {
15921585
if (!disposable.isDisposed) {

‎dist/rx.compat.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.compat.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)