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

Commit 800255c

Browse files
mattpodwysockimattpodwysocki
committed
Fixing Issue #203 
1 parent 75c4608 commit 800255c

File tree

10 files changed

+182
-142
lines changed

10 files changed

+182
-142
lines changed

‎Gruntfile.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ var browsers = [{
10421042
// Time operators
10431043
'src/core/linq/observable/_observabletimertimespan.js', // AnonymousObservable, normalizeTime
10441044
'src/core/linq/observable/_observabletimertimespanandperiod.js', // AnonymousObservable, defer, _observabletimerdateandperiod
1045+
'src/core/linq/observable/_observabletimerdateandperiod.js',
10451046
'src/core/linq/observable/interval.js', // timeoutScheduler, _observabletimertimespanandperiod
10461047
'src/core/linq/observable/timer-lite.js', // timeoutScheduler, _observabletimerdate, _observabletimerdateandperiod, _observabletimertimespan, _observabletimertimespanandperiod
10471048
'src/core/linq/observable/delay-lite.js', // AnonymousObservable, timeoutScheduler, SerialDisposable, materialize, timestamp
@@ -1212,6 +1213,7 @@ var browsers = [{
12121213
// Time operators
12131214
'src/core/linq/observable/_observabletimertimespan.js', // AnonymousObservable, normalizeTime
12141215
'src/core/linq/observable/_observabletimertimespanandperiod.js', // AnonymousObservable, defer, _observabletimerdateandperiod
1216+
'src/core/linq/observable/_observabletimerdateandperiod.js',
12151217
'src/core/linq/observable/interval.js', // timeoutScheduler, _observabletimertimespanandperiod
12161218
'src/core/linq/observable/timer-lite.js', // timeoutScheduler, _observabletimerdate, _observabletimerdateandperiod, _observabletimertimespan, _observabletimertimespanandperiod
12171219
'src/core/linq/observable/delay-lite.js', // AnonymousObservable, timeoutScheduler, SerialDisposable, materialize, timestamp

‎dist/rx.all.compat.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7491,24 +7491,24 @@
74917491
});
74927492
}
74937493

7494-
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
7495-
var p = normalizeTime(period);
7496-
return new AnonymousObservable(function (observer) {
7497-
var count = 0, d = dueTime;
7498-
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
7499-
var now;
7500-
if (p > 0) {
7501-
now = scheduler.now();
7502-
d = d + p;
7503-
if (d <= now) {
7504-
d = now + p;
7505-
}
7506-
}
7507-
observer.onNext(count++);
7508-
self(d);
7509-
});
7510-
});
7511-
}
7494+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
7495+
var p = normalizeTime(period);
7496+
return new AnonymousObservable(function (observer) {
7497+
var count = 0, d = dueTime;
7498+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
7499+
var now;
7500+
if (p > 0) {
7501+
now = scheduler.now();
7502+
d = d + p;
7503+
if (d <= now) {
7504+
d = now + p;
7505+
}
7506+
}
7507+
observer.onNext(count++);
7508+
self(d);
7509+
});
7510+
});
7511+
}
75127512

75137513
function observableTimerTimeSpan(dueTime, scheduler) {
75147514
var d = normalizeTime(dueTime);
@@ -7520,19 +7520,19 @@
75207520
});
75217521
}
75227522

7523-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
7524-
if (dueTime === period) {
7525-
return new AnonymousObservable(function (observer) {
7526-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
7527-
observer.onNext(count);
7528-
return count + 1;
7529-
});
7530-
});
7531-
}
7532-
return observableDefer(function () {
7533-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
7523+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
7524+
if (dueTime === period) {
7525+
return new AnonymousObservable(function (observer) {
7526+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
7527+
observer.onNext(count);
7528+
return count + 1;
75347529
});
7530+
});
75357531
}
7532+
return observableDefer(function () {
7533+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
7534+
});
7535+
}
75367536

75377537
/**
75387538
* Returns an observable sequence that produces a value after each period.

‎dist/rx.all.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7305,24 +7305,24 @@
73057305
});
73067306
}
73077307

7308-
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
7309-
var p = normalizeTime(period);
7310-
return new AnonymousObservable(function (observer) {
7311-
var count = 0, d = dueTime;
7312-
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
7313-
var now;
7314-
if (p > 0) {
7315-
now = scheduler.now();
7316-
d = d + p;
7317-
if (d <= now) {
7318-
d = now + p;
7319-
}
7320-
}
7321-
observer.onNext(count++);
7322-
self(d);
7323-
});
7324-
});
7325-
}
7308+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
7309+
var p = normalizeTime(period);
7310+
return new AnonymousObservable(function (observer) {
7311+
var count = 0, d = dueTime;
7312+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
7313+
var now;
7314+
if (p > 0) {
7315+
now = scheduler.now();
7316+
d = d + p;
7317+
if (d <= now) {
7318+
d = now + p;
7319+
}
7320+
}
7321+
observer.onNext(count++);
7322+
self(d);
7323+
});
7324+
});
7325+
}
73267326

73277327
function observableTimerTimeSpan(dueTime, scheduler) {
73287328
var d = normalizeTime(dueTime);
@@ -7334,19 +7334,19 @@
73347334
});
73357335
}
73367336

7337-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
7338-
if (dueTime === period) {
7339-
return new AnonymousObservable(function (observer) {
7340-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
7341-
observer.onNext(count);
7342-
return count + 1;
7343-
});
7344-
});
7345-
}
7346-
return observableDefer(function () {
7347-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
7337+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
7338+
if (dueTime === period) {
7339+
return new AnonymousObservable(function (observer) {
7340+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
7341+
observer.onNext(count);
7342+
return count + 1;
73487343
});
7344+
});
73497345
}
7346+
return observableDefer(function () {
7347+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
7348+
});
7349+
}
73507350

73517351
/**
73527352
* Returns an observable sequence that produces a value after each period.

‎dist/rx.lite.compat.js‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4042,19 +4042,38 @@
40424042
});
40434043
}
40444044

4045-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
4046-
if (dueTime === period) {
4047-
return new AnonymousObservable(function (observer) {
4048-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
4049-
observer.onNext(count);
4050-
return count + 1;
4051-
});
4052-
});
4053-
}
4054-
return observableDefer(function () {
4055-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
4045+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
4046+
if (dueTime === period) {
4047+
return new AnonymousObservable(function (observer) {
4048+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
4049+
observer.onNext(count);
4050+
return count + 1;
40564051
});
4052+
});
40574053
}
4054+
return observableDefer(function () {
4055+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
4056+
});
4057+
}
4058+
4059+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
4060+
var p = normalizeTime(period);
4061+
return new AnonymousObservable(function (observer) {
4062+
var count = 0, d = dueTime;
4063+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
4064+
var now;
4065+
if (p > 0) {
4066+
now = scheduler.now();
4067+
d = d + p;
4068+
if (d <= now) {
4069+
d = now + p;
4070+
}
4071+
}
4072+
observer.onNext(count++);
4073+
self(d);
4074+
});
4075+
});
4076+
}
40584077

40594078
/**
40604079
* Returns an observable sequence that produces a value after each period.

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.lite.js‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,19 +3856,38 @@
38563856
});
38573857
}
38583858

3859-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
3860-
if (dueTime === period) {
3861-
return new AnonymousObservable(function (observer) {
3862-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
3863-
observer.onNext(count);
3864-
return count + 1;
3865-
});
3866-
});
3867-
}
3868-
return observableDefer(function () {
3869-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
3859+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
3860+
if (dueTime === period) {
3861+
return new AnonymousObservable(function (observer) {
3862+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
3863+
observer.onNext(count);
3864+
return count + 1;
38703865
});
3866+
});
38713867
}
3868+
return observableDefer(function () {
3869+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
3870+
});
3871+
}
3872+
3873+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
3874+
var p = normalizeTime(period);
3875+
return new AnonymousObservable(function (observer) {
3876+
var count = 0, d = dueTime;
3877+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
3878+
var now;
3879+
if (p > 0) {
3880+
now = scheduler.now();
3881+
d = d + p;
3882+
if (d <= now) {
3883+
d = now + p;
3884+
}
3885+
}
3886+
observer.onNext(count++);
3887+
self(d);
3888+
});
3889+
});
3890+
}
38723891

38733892
/**
38743893
* Returns an observable sequence that produces a value after each period.

‎dist/rx.lite.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/rx.time.js‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@
6262
});
6363
}
6464

65-
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
66-
var p = normalizeTime(period);
67-
return new AnonymousObservable(function (observer) {
68-
var count = 0, d = dueTime;
69-
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
70-
var now;
71-
if (p > 0) {
72-
now = scheduler.now();
73-
d = d + p;
74-
if (d <= now) {
75-
d = now + p;
76-
}
77-
}
78-
observer.onNext(count++);
79-
self(d);
80-
});
81-
});
82-
}
65+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
66+
var p = normalizeTime(period);
67+
return new AnonymousObservable(function (observer) {
68+
var count = 0, d = dueTime;
69+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
70+
var now;
71+
if (p > 0) {
72+
now = scheduler.now();
73+
d = d + p;
74+
if (d <= now) {
75+
d = now + p;
76+
}
77+
}
78+
observer.onNext(count++);
79+
self(d);
80+
});
81+
});
82+
}
8383

8484
function observableTimerTimeSpan(dueTime, scheduler) {
8585
var d = normalizeTime(dueTime);
@@ -91,19 +91,19 @@
9191
});
9292
}
9393

94-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
95-
if (dueTime === period) {
96-
return new AnonymousObservable(function (observer) {
97-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
98-
observer.onNext(count);
99-
return count + 1;
100-
});
101-
});
102-
}
103-
return observableDefer(function () {
104-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
94+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
95+
if (dueTime === period) {
96+
return new AnonymousObservable(function (observer) {
97+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
98+
observer.onNext(count);
99+
return count + 1;
105100
});
101+
});
106102
}
103+
return observableDefer(function () {
104+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
105+
});
106+
}
107107

108108
/**
109109
* Returns an observable sequence that produces a value after each period.

‎src/core/linq/observable/_observabletimerdateandperiod.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
2-
var p = normalizeTime(period);
3-
return new AnonymousObservable(function (observer) {
4-
var count = 0, d = dueTime;
5-
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
6-
var now;
7-
if (p > 0) {
8-
now = scheduler.now();
9-
d = d + p;
10-
if (d <= now) {
11-
d = now + p;
12-
}
13-
}
14-
observer.onNext(count++);
15-
self(d);
16-
});
17-
});
18-
}
1+
function observableTimerDateAndPeriod(dueTime, period, scheduler) {
2+
var p = normalizeTime(period);
3+
return new AnonymousObservable(function (observer) {
4+
var count = 0, d = dueTime;
5+
return scheduler.scheduleRecursiveWithAbsolute(d, function (self) {
6+
var now;
7+
if (p > 0) {
8+
now = scheduler.now();
9+
d = d + p;
10+
if (d <= now) {
11+
d = now + p;
12+
}
13+
}
14+
observer.onNext(count++);
15+
self(d);
16+
});
17+
});
18+
}

‎src/core/linq/observable/_observabletimertimespanandperiod.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
2-
if (dueTime === period) {
3-
return new AnonymousObservable(function (observer) {
4-
return scheduler.schedulePeriodicWithState(0, period, function (count) {
5-
observer.onNext(count);
6-
return count + 1;
7-
});
8-
});
9-
}
10-
return observableDefer(function () {
11-
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
1+
function observableTimerTimeSpanAndPeriod(dueTime, period, scheduler) {
2+
if (dueTime === period) {
3+
return new AnonymousObservable(function (observer) {
4+
return scheduler.schedulePeriodicWithState(0, period, function (count) {
5+
observer.onNext(count);
6+
return count + 1;
127
});
8+
});
139
}
10+
return observableDefer(function () {
11+
return observableTimerDateAndPeriod(scheduler.now() + dueTime, period, scheduler);
12+
});
13+
}

0 commit comments

Comments
 (0)