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

Commit 1ad1e89

Browse files
mattpodwysockimattpodwysocki
committed
Flattening
1 parent f294d5b commit 1ad1e89

28 files changed

Lines changed: 406 additions & 436 deletions

‎dist/rx.all.compat.js‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,57 +1221,54 @@
12211221

12221222
function invokeRecImmediate(scheduler, pair) {
12231223
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1224+
action(state, innerAction);
1225+
return group;
12241226

1225-
function recursiveAction(state1) {
1226-
1227-
function innerAction(state2) {
1228-
var isAdded = false, isDone = false;
1227+
function innerAction(state2) {
1228+
var isAdded = false, isDone = false;
12291229

1230-
function scheduleWork(_, state3) {
1231-
if (isAdded) {
1232-
group.remove(d);
1233-
} else {
1234-
isDone = true;
1235-
}
1236-
recursiveAction(state3);
1237-
return disposableEmpty;
1238-
}
1230+
var d = scheduler.scheduleWithState(state2, scheduleWork);
1231+
if (!isDone) {
1232+
group.add(d);
1233+
isAdded = true;
1234+
}
12391235

1240-
d = scheduler.scheduleWithState(state2, scheduleWork);
1241-
if (!isDone) {
1242-
group.add(d);
1243-
isAdded = true;
1236+
function scheduleWork(_, state3) {
1237+
if (isAdded) {
1238+
group.remove(d);
1239+
} else {
1240+
isDone = true;
12441241
}
1242+
action(state3, innerAction);
1243+
return disposableEmpty;
12451244
}
1246-
1247-
action(state1, innerAction);
12481245
}
1249-
recursiveAction(state);
1250-
return group;
12511246
}
12521247

12531248
function invokeRecDate(scheduler, pair, method) {
12541249
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1255-
function recursiveAction(state1) {
1256-
action(state1, function (state2, dueTime1) {
1257-
var isAdded = false, isDone = false,
1258-
d = scheduler[method](state2, dueTime1, function (scheduler1, state3) {
1259-
if (isAdded) {
1260-
group.remove(d);
1261-
} else {
1262-
isDone = true;
1263-
}
1264-
recursiveAction(state3);
1265-
return disposableEmpty;
1266-
});
1267-
if (!isDone) {
1268-
group.add(d);
1269-
isAdded = true;
1270-
}
1271-
});
1272-
};
1273-
recursiveAction(state);
1250+
action(state, innerAction);
12741251
return group;
1252+
1253+
function innerAction(state2, dueTime1) {
1254+
var isAdded = false, isDone = false;
1255+
1256+
var d = scheduler[method](state2, dueTime1, scheduleWork);
1257+
if (!isDone) {
1258+
group.add(d);
1259+
isAdded = true;
1260+
}
1261+
1262+
function scheduleWork(_, state3) {
1263+
if (isAdded) {
1264+
group.remove(d);
1265+
} else {
1266+
isDone = true;
1267+
}
1268+
action(state3, innerAction);
1269+
return disposableEmpty;
1270+
}
1271+
}
12751272
}
12761273

12771274
function scheduleInnerRecursive(action, self) {

‎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: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.all.js‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,57 +1030,54 @@
10301030

10311031
function invokeRecImmediate(scheduler, pair) {
10321032
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1033+
action(state, innerAction);
1034+
return group;
10331035

1034-
function recursiveAction(state1) {
1035-
1036-
function innerAction(state2) {
1037-
var isAdded = false, isDone = false;
1036+
function innerAction(state2) {
1037+
var isAdded = false, isDone = false;
10381038

1039-
function scheduleWork(_, state3) {
1040-
if (isAdded) {
1041-
group.remove(d);
1042-
} else {
1043-
isDone = true;
1044-
}
1045-
recursiveAction(state3);
1046-
return disposableEmpty;
1047-
}
1039+
var d = scheduler.scheduleWithState(state2, scheduleWork);
1040+
if (!isDone) {
1041+
group.add(d);
1042+
isAdded = true;
1043+
}
10481044

1049-
d = scheduler.scheduleWithState(state2, scheduleWork);
1050-
if (!isDone) {
1051-
group.add(d);
1052-
isAdded = true;
1045+
function scheduleWork(_, state3) {
1046+
if (isAdded) {
1047+
group.remove(d);
1048+
} else {
1049+
isDone = true;
10531050
}
1051+
action(state3, innerAction);
1052+
return disposableEmpty;
10541053
}
1055-
1056-
action(state1, innerAction);
10571054
}
1058-
recursiveAction(state);
1059-
return group;
10601055
}
10611056

10621057
function invokeRecDate(scheduler, pair, method) {
10631058
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1064-
function recursiveAction(state1) {
1065-
action(state1, function (state2, dueTime1) {
1066-
var isAdded = false, isDone = false,
1067-
d = scheduler[method](state2, dueTime1, function (scheduler1, state3) {
1068-
if (isAdded) {
1069-
group.remove(d);
1070-
} else {
1071-
isDone = true;
1072-
}
1073-
recursiveAction(state3);
1074-
return disposableEmpty;
1075-
});
1076-
if (!isDone) {
1077-
group.add(d);
1078-
isAdded = true;
1079-
}
1080-
});
1081-
};
1082-
recursiveAction(state);
1059+
action(state, innerAction);
10831060
return group;
1061+
1062+
function innerAction(state2, dueTime1) {
1063+
var isAdded = false, isDone = false;
1064+
1065+
var d = scheduler[method](state2, dueTime1, scheduleWork);
1066+
if (!isDone) {
1067+
group.add(d);
1068+
isAdded = true;
1069+
}
1070+
1071+
function scheduleWork(_, state3) {
1072+
if (isAdded) {
1073+
group.remove(d);
1074+
} else {
1075+
isDone = true;
1076+
}
1077+
action(state3, innerAction);
1078+
return disposableEmpty;
1079+
}
1080+
}
10841081
}
10851082

10861083
function scheduleInnerRecursive(action, self) {

‎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: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.compat.js‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,57 +1135,54 @@
11351135

11361136
function invokeRecImmediate(scheduler, pair) {
11371137
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1138+
action(state, innerAction);
1139+
return group;
11381140

1139-
function recursiveAction(state1) {
1140-
1141-
function innerAction(state2) {
1142-
var isAdded = false, isDone = false;
1141+
function innerAction(state2) {
1142+
var isAdded = false, isDone = false;
11431143

1144-
function scheduleWork(_, state3) {
1145-
if (isAdded) {
1146-
group.remove(d);
1147-
} else {
1148-
isDone = true;
1149-
}
1150-
recursiveAction(state3);
1151-
return disposableEmpty;
1152-
}
1144+
var d = scheduler.scheduleWithState(state2, scheduleWork);
1145+
if (!isDone) {
1146+
group.add(d);
1147+
isAdded = true;
1148+
}
11531149

1154-
d = scheduler.scheduleWithState(state2, scheduleWork);
1155-
if (!isDone) {
1156-
group.add(d);
1157-
isAdded = true;
1150+
function scheduleWork(_, state3) {
1151+
if (isAdded) {
1152+
group.remove(d);
1153+
} else {
1154+
isDone = true;
11581155
}
1156+
action(state3, innerAction);
1157+
return disposableEmpty;
11591158
}
1160-
1161-
action(state1, innerAction);
11621159
}
1163-
recursiveAction(state);
1164-
return group;
11651160
}
11661161

11671162
function invokeRecDate(scheduler, pair, method) {
11681163
var state = pair[0], action = pair[1], group = new CompositeDisposable();
1169-
function recursiveAction(state1) {
1170-
action(state1, function (state2, dueTime1) {
1171-
var isAdded = false, isDone = false,
1172-
d = scheduler[method](state2, dueTime1, function (scheduler1, state3) {
1173-
if (isAdded) {
1174-
group.remove(d);
1175-
} else {
1176-
isDone = true;
1177-
}
1178-
recursiveAction(state3);
1179-
return disposableEmpty;
1180-
});
1181-
if (!isDone) {
1182-
group.add(d);
1183-
isAdded = true;
1184-
}
1185-
});
1186-
};
1187-
recursiveAction(state);
1164+
action(state, innerAction);
11881165
return group;
1166+
1167+
function innerAction(state2, dueTime1) {
1168+
var isAdded = false, isDone = false;
1169+
1170+
var d = scheduler[method](state2, dueTime1, scheduleWork);
1171+
if (!isDone) {
1172+
group.add(d);
1173+
isAdded = true;
1174+
}
1175+
1176+
function scheduleWork(_, state3) {
1177+
if (isAdded) {
1178+
group.remove(d);
1179+
} else {
1180+
isDone = true;
1181+
}
1182+
action(state3, innerAction);
1183+
return disposableEmpty;
1184+
}
1185+
}
11891186
}
11901187

11911188
function scheduleInnerRecursive(action, self) {

‎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: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.core.js‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -509,57 +509,54 @@ var
509509

510510
function invokeRecImmediate(scheduler, pair) {
511511
var state = pair[0], action = pair[1], group = new CompositeDisposable();
512+
action(state, innerAction);
513+
return group;
512514

513-
function recursiveAction(state1) {
514-
515-
function innerAction(state2) {
516-
var isAdded = false, isDone = false;
515+
function innerAction(state2) {
516+
var isAdded = false, isDone = false;
517517

518-
function scheduleWork(_, state3) {
519-
if (isAdded) {
520-
group.remove(d);
521-
} else {
522-
isDone = true;
523-
}
524-
recursiveAction(state3);
525-
return disposableEmpty;
526-
}
518+
var d = scheduler.scheduleWithState(state2, scheduleWork);
519+
if (!isDone) {
520+
group.add(d);
521+
isAdded = true;
522+
}
527523

528-
d = scheduler.scheduleWithState(state2, scheduleWork);
529-
if (!isDone) {
530-
group.add(d);
531-
isAdded = true;
524+
function scheduleWork(_, state3) {
525+
if (isAdded) {
526+
group.remove(d);
527+
} else {
528+
isDone = true;
532529
}
530+
action(state3, innerAction);
531+
return disposableEmpty;
533532
}
534-
535-
action(state1, innerAction);
536533
}
537-
recursiveAction(state);
538-
return group;
539534
}
540535

541536
function invokeRecDate(scheduler, pair, method) {
542537
var state = pair[0], action = pair[1], group = new CompositeDisposable();
543-
function recursiveAction(state1) {
544-
action(state1, function (state2, dueTime1) {
545-
var isAdded = false, isDone = false,
546-
d = scheduler[method](state2, dueTime1, function (scheduler1, state3) {
547-
if (isAdded) {
548-
group.remove(d);
549-
} else {
550-
isDone = true;
551-
}
552-
recursiveAction(state3);
553-
return disposableEmpty;
554-
});
555-
if (!isDone) {
556-
group.add(d);
557-
isAdded = true;
558-
}
559-
});
560-
};
561-
recursiveAction(state);
538+
action(state, innerAction);
562539
return group;
540+
541+
function innerAction(state2, dueTime1) {
542+
var isAdded = false, isDone = false;
543+
544+
var d = scheduler[method](state2, dueTime1, scheduleWork);
545+
if (!isDone) {
546+
group.add(d);
547+
isAdded = true;
548+
}
549+
550+
function scheduleWork(_, state3) {
551+
if (isAdded) {
552+
group.remove(d);
553+
} else {
554+
isDone = true;
555+
}
556+
action(state3, innerAction);
557+
return disposableEmpty;
558+
}
559+
}
563560
}
564561

565562
function scheduleInnerRecursive(action, self) {

0 commit comments

Comments
 (0)