diff options
Diffstat (limited to 'tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js')
-rw-r--r-- | tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js b/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js index 189188489a..b9bb80ec8f 100644 --- a/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js +++ b/tools/node_modules/eslint/node_modules/rxjs/internal/operators/mergeScan.js @@ -13,8 +13,6 @@ var __extends = (this && this.__extends) || (function () { }; })(); Object.defineProperty(exports, "__esModule", { value: true }); -var tryCatch_1 = require("../util/tryCatch"); -var errorObject_1 = require("../util/errorObject"); var subscribeToResult_1 = require("../util/subscribeToResult"); var OuterSubscriber_1 = require("../OuterSubscriber"); var InnerSubscriber_1 = require("../InnerSubscriber"); @@ -52,15 +50,17 @@ var MergeScanSubscriber = (function (_super) { MergeScanSubscriber.prototype._next = function (value) { if (this.active < this.concurrent) { var index = this.index++; - var ish = tryCatch_1.tryCatch(this.accumulator)(this.acc, value); var destination = this.destination; - if (ish === errorObject_1.errorObject) { - destination.error(errorObject_1.errorObject.e); + var ish = void 0; + try { + var accumulator = this.accumulator; + ish = accumulator(this.acc, value, index); } - else { - this.active++; - this._innerSub(ish, value, index); + catch (e) { + return destination.error(e); } + this.active++; + this._innerSub(ish, value, index); } else { this.buffer.push(value); |