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

Commit

Permalink
Fixing generate*
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattpodwysocki
mattpodwysocki committed Feb 1, 2016
1 parent 233e209 commit 9d4df73
Show file tree
Hide file tree
Showing 36 changed files with 941 additions and 90 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.DS_Store
node_modules
npm-debug.log
.vscode/
1 change: 1 addition & 0 deletions .npmignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules/
modules/
.npm-debug.log
.nuget/
.vscode/
nuget/
doc/
examples/
Expand Down
19 changes: 10 additions & 9 deletions dist/rx.all.compat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9644,7 +9644,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}));
}
} catch (e) {
observableThrow(e).subscribe(o);
return observableThrow(e).subscribe(o);
}
var group = new CompositeDisposable();
externalSubscriptions.forEach(function (joinObserver) {
Expand Down Expand Up @@ -10519,7 +10519,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}

function scheduleRecursive(state, recurse) {
state.hasResult && state.o.onNext(state.newState);
state.hasResult && state.o.onNext(state.result);

if (state.first) {
state.first = false;
Expand All @@ -10530,8 +10530,8 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
state.hasResult = tryCatch(state.self._cndFn)(state.newState);
if (state.hasResult === errorObj) { return state.o.onError(state.hasResult.e); }
if (state.hasResult) {
var result = tryCatch(state.self._resFn)(state.newState);
if (result === errorObj) { return state.o.onError(result.e); }
state.result = tryCatch(state.self._resFn)(state.newState);
if (state.result === errorObj) { return state.o.onError(state.result.e); }
var time = tryCatch(state.self._timeFn)(state.newState);
if (time === errorObj) { return state.o.onError(time.e); }
recurse(state, time);
Expand All @@ -10546,7 +10546,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
self: this,
newState: this._state,
first: true,
hasValue: false
hasResult: false
};
return this._s.scheduleRecursiveFuture(state, new Date(this._s.now()), scheduleRecursive);
};
Expand Down Expand Up @@ -10591,19 +10591,20 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}

function scheduleRecursive(state, recurse) {
state.hasResult && state.o.onNext(state.newState);
state.hasResult && state.o.onNext(state.result);

if (state.first) {
state.first = false;
} else {
state.newState = tryCatch(state.self._itrFn)(state.newState);
if (state.newState === errorObj) { return state.o.onError(state.newState.e); }
}

state.hasResult = tryCatch(state.self._cndFn)(state.newState);
if (state.hasResult === errorObj) { return state.o.onError(state.hasResult.e); }
if (state.hasResult) {
var result = tryCatch(state.self._resFn)(state.newState);
if (result === errorObj) { return state.o.onError(result.e); }
state.result = tryCatch(state.self._resFn)(state.newState);
if (state.result === errorObj) { return state.o.onError(state.result.e); }
var time = tryCatch(state.self._timeFn)(state.newState);
if (time === errorObj) { return state.o.onError(time.e); }
recurse(state, time);
Expand All @@ -10618,7 +10619,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
self: this,
newState: this._state,
first: true,
hasValue: false
hasResult: false
};
return this._s.scheduleRecursiveFuture(state, 0, scheduleRecursive);
};
Expand Down
2 changes: 1 addition & 1 deletion dist/rx.all.compat.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/rx.all.compat.min.js
View file

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions dist/rx.all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9382,7 +9382,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}));
}
} catch (e) {
observableThrow(e).subscribe(o);
return observableThrow(e).subscribe(o);
}
var group = new CompositeDisposable();
externalSubscriptions.forEach(function (joinObserver) {
Expand Down Expand Up @@ -10257,7 +10257,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}

function scheduleRecursive(state, recurse) {
state.hasResult && state.o.onNext(state.newState);
state.hasResult && state.o.onNext(state.result);

if (state.first) {
state.first = false;
Expand All @@ -10268,8 +10268,8 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
state.hasResult = tryCatch(state.self._cndFn)(state.newState);
if (state.hasResult === errorObj) { return state.o.onError(state.hasResult.e); }
if (state.hasResult) {
var result = tryCatch(state.self._resFn)(state.newState);
if (result === errorObj) { return state.o.onError(result.e); }
state.result = tryCatch(state.self._resFn)(state.newState);
if (state.result === errorObj) { return state.o.onError(state.result.e); }
var time = tryCatch(state.self._timeFn)(state.newState);
if (time === errorObj) { return state.o.onError(time.e); }
recurse(state, time);
Expand All @@ -10284,7 +10284,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
self: this,
newState: this._state,
first: true,
hasValue: false
hasResult: false
};
return this._s.scheduleRecursiveFuture(state, new Date(this._s.now()), scheduleRecursive);
};
Expand Down Expand Up @@ -10329,19 +10329,20 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
}

function scheduleRecursive(state, recurse) {
state.hasResult && state.o.onNext(state.newState);
state.hasResult && state.o.onNext(state.result);

if (state.first) {
state.first = false;
} else {
state.newState = tryCatch(state.self._itrFn)(state.newState);
if (state.newState === errorObj) { return state.o.onError(state.newState.e); }
}

state.hasResult = tryCatch(state.self._cndFn)(state.newState);
if (state.hasResult === errorObj) { return state.o.onError(state.hasResult.e); }
if (state.hasResult) {
var result = tryCatch(state.self._resFn)(state.newState);
if (result === errorObj) { return state.o.onError(result.e); }
state.result = tryCatch(state.self._resFn)(state.newState);
if (state.result === errorObj) { return state.o.onError(state.result.e); }
var time = tryCatch(state.self._timeFn)(state.newState);
if (time === errorObj) { return state.o.onError(time.e); }
recurse(state, time);
Expand All @@ -10356,7 +10357,7 @@ Observable.fromNodeCallback = function (fn, ctx, selector) {
self: this,
newState: this._state,
first: true,
hasValue: false
hasResult: false
};
return this._s.scheduleRecursiveFuture(state, 0, scheduleRecursive);
};
Expand Down
2 changes: 1 addition & 1 deletion dist/rx.all.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/rx.all.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/rx.joinpatterns.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
}));
}
} catch (e) {
observableThrow(e).subscribe(o);
return observableThrow(e).subscribe(o);
}
var group = new CompositeDisposable();
externalSubscriptions.forEach(function (joinObserver) {
Expand Down
Loading

0 comments on commit 9d4df73

Please sign in to comment.