zone.js - npm Package Compare versions

Comparing version 0.6.26 to 0.7.0

dist/zone-node.js

@@ -47,3 +47,3 @@ /**
             get: function () {
-                return _currentZone;
+                return _currentZoneFrame.zone;
             },
@@ -112,4 +112,3 @@ enumerable: true,
             if (source === void 0) { source = null; }
-            var oldZone = _currentZone;
-            _currentZone = this;
+            _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
             try {
@@ -119,3 +118,3 @@ return this._zoneDelegate.invoke(this, callback, applyThis, applyArgs, source);
             finally {
-                _currentZone = oldZone;
+                _currentZoneFrame = _currentZoneFrame.parent;
             }
@@ -127,4 +126,3 @@ };
             if (source === void 0) { source = null; }
-            var oldZone = _currentZone;
-            _currentZone = this;
+            _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
             try {
@@ -141,3 +139,3 @@ try {
             finally {
-                _currentZone = oldZone;
+                _currentZoneFrame = _currentZoneFrame.parent;
             }
@@ -152,4 +150,3 @@ };
             _currentTask = task;
-            var oldZone = _currentZone;
-            _currentZone = this;
+            _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
             try {
@@ -169,3 +166,3 @@ if (task.type == 'macroTask' && task.data && !task.data.isPeriodic) {
             finally {
-                _currentZone = oldZone;
+                _currentZoneFrame = _currentZoneFrame.parent;
                 _currentTask = previousTask;
@@ -362,2 +359,9 @@ }
     }());
+    var ZoneFrame = (function () {
+        function ZoneFrame(parent, zone) {
+            this.parent = parent;
+            this.zone = zone;
+        }
+        return ZoneFrame;
+    }());
     function __symbol__(name) {
@@ -370,3 +374,3 @@ return '__zone_symbol__' + name;
     var symbolThen = __symbol__('then');
-    var _currentZone = new Zone(null, null);
+    var _currentZoneFrame = new ZoneFrame(null, new Zone(null, null));
     var _currentTask = null;
@@ -380,3 +384,3 @@ var _microTaskQueue = [];
         // we must bootstrap the initial task creation by manually scheduling the drain
-        if (_numberOfNestedTaskFrames == 0 && _microTaskQueue.length == 0) {
+        if (_numberOfNestedTaskFrames === 0 && _microTaskQueue.length === 0) {
             // We are not running in Task, so we need to kickstart the microtask queue.
@@ -461,3 +465,6 @@ if (global[symbolPromise]) {
         if (promise[symbolState] === UNRESOLVED) {
-            if (value instanceof ZoneAwarePromise && value[symbolState] !== UNRESOLVED) {
+            if (value instanceof ZoneAwarePromise &&
+                value.hasOwnProperty(symbolState) &&
+                value.hasOwnProperty(symbolValue) &&
+                value[symbolState] !== UNRESOLVED) {
                 clearRejectedNoCatch(value);
@@ -648,2 +655,148 @@ resolvePromise(promise, value[symbolState], value[symbolValue]);
     Promise[Zone.__symbol__('uncaughtPromiseErrors')] = _uncaughtPromiseErrors;
+    /*
+     * This code patches Error so that:
+     *   - It ignores un-needed stack frames.
+     *   - It Shows the associated Zone for reach frame.
+     */
+    var FrameType;
+    (function (FrameType) {
+        /// Skip this frame when printing out stack
+        FrameType[FrameType["blackList"] = 0] = "blackList";
+        /// This frame marks zone transition
+        FrameType[FrameType["trasition"] = 1] = "trasition";
+    })(FrameType || (FrameType = {}));
+    
+    var NativeError = global[__symbol__('Error')] = global.Error;
+    // Store the frames which should be removed from the stack frames
+    var blackListedStackFrames = {};
+    // We must find the frame where Error was created, otherwise we assume we don't understand stack
+    var zoneAwareFrame;
+    global.Error = ZoneAwareError;
+    // How should the stack frames be parsed.
+    var frameParserStrategy = null;
+    var stackRewrite = 'stackRewrite';
+    /**
+     * This is ZoneAwareError which processes the stack frame and cleans up extra frames as well as
+     * adds zone information to it.
+     */
+    function ZoneAwareError() {
+        // Create an Error.
+        var error = NativeError.apply(this, arguments);
+        // Save original stack trace
+        error.originalStack = error.stack;
+        // Process the stack trace and rewrite the frames.
+        if (ZoneAwareError[stackRewrite] && error.originalStack) {
+            var frames_1 = error.originalStack.split('\n');
+            var zoneFrame = _currentZoneFrame;
+            var i = 0;
+            // Find the first frame
+            while (frames_1[i] !== zoneAwareFrame && i < frames_1.length) {
+                i++;
+            }
+            for (; i < frames_1.length && zoneFrame; i++) {
+                var frame = frames_1[i];
+                if (frame.trim()) {
+                    var frameType = blackListedStackFrames.hasOwnProperty(frame) && blackListedStackFrames[frame];
+                    if (frameType === FrameType.blackList) {
+                        frames_1.splice(i, 1);
+                        i--;
+                    }
+                    else if (frameType === FrameType.trasition) {
+                        if (zoneFrame.parent) {
+                            // This is the special frame where zone changed. Print and process it accordingly
+                            frames_1[i] += " [" + zoneFrame.parent.zone.name + " => " + zoneFrame.zone.name + "]";
+                            zoneFrame = zoneFrame.parent;
+                        }
+                        else {
+                            zoneFrame = null;
+                        }
+                    }
+                    else {
+                        frames_1[i] += " [" + zoneFrame.zone.name + "]";
+                    }
+                }
+            }
+            error.stack = error.zoneAwareStack = frames_1.join('\n');
+        }
+        return error;
+    }
+    
+    // Copy the prototype so that instanceof operator works as expected
+    ZoneAwareError.prototype = NativeError.prototype;
+    ZoneAwareError[Zone.__symbol__('blacklistedStackFrames')] = blackListedStackFrames;
+    ZoneAwareError[stackRewrite] = false;
+    if (NativeError.hasOwnProperty('stackTraceLimit')) {
+        // Extend default stack limit as we will be removing few frames.
+        NativeError.stackTraceLimit = Math.max(NativeError.stackTraceLimit, 15);
+        // make sure that ZoneAwareError has the same property which forwards to NativeError.
+        Object.defineProperty(ZoneAwareError, 'stackTraceLimit', {
+            get: function () { return NativeError.stackTraceLimit; },
+            set: function (value) { return NativeError.stackTraceLimit = value; }
+        });
+    }
+    // Now we need to populet the `blacklistedStackFrames` as well as find the
+    // run/runGuraded/runTask frames. This is done by creating a detect zone and then threading
+    // the execution through all of the above methods so that we can look at the stack trace and
+    // find the frames of interest.
+    var detectZone = Zone.current.fork({
+        name: 'detect',
+        onInvoke: function (parentZoneDelegate, currentZone, targetZone, delegate, applyThis, applyArgs, source) {
+            // Here only so that it will show up in the stack frame so that it can be black listed.
+            return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
+        },
+        onHandleError: function (parentZD, current, target, error) {
+            if (error.originalStack && Error === ZoneAwareError) {
+                var frames_2 = error.originalStack.split(/\n/);
+                var runFrame = false, runGuardedFrame = false, runTaskFrame = false;
+                while (frames_2.length) {
+                    var frame = frames_2.shift();
+                    // On safari it is possible to have stack frame with no line number.
+                    // This check makes sure that we don't filter frames on name only (must have linenumber)
+                    if (/:\d+:\d+/.test(frame)) {
+                        // Get rid of the path so that we don't accidintely find function name in path.
+                        // In chrome the seperator is `(` and `@` in FF and safari
+                        // Chrome: at Zone.run (zone.js:100)
+                        // Chrome: at Zone.run (http://localhost:9876/base/build/lib/zone.js:100:24)
+                        // FireFox: Zone.prototype.run@http://localhost:9876/base/build/lib/zone.js:101:24
+                        // Safari: run@http://localhost:9876/base/build/lib/zone.js:101:24
+                        var fnName = frame.split('(')[0].split('@')[0];
+                        var frameType = FrameType.trasition;
+                        if (fnName.indexOf('ZoneAwareError') !== -1) {
+                            zoneAwareFrame = frame;
+                        }
+                        if (fnName.indexOf('runGuarded') !== -1) {
+                            runGuardedFrame = true;
+                        }
+                        else if (fnName.indexOf('runTask') !== -1) {
+                            runTaskFrame = true;
+                        }
+                        else if (fnName.indexOf('run') !== -1) {
+                            runFrame = true;
+                        }
+                        else {
+                            frameType = FrameType.blackList;
+                        }
+                        blackListedStackFrames[frame] = frameType;
+                        // Once we find all of the frames we can stop looking.
+                        if (runFrame && runGuardedFrame && runTaskFrame) {
+                            ZoneAwareError[stackRewrite] = true;
+                            break;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    });
+    // carefully constructor a stack frame which contains all of the frames of interest which
+    // need to be detected and blacklisted.
+    var detectRunFn = function () {
+        detectZone.run(function () {
+            detectZone.runGuarded(function () {
+                throw new Error('blacklistStackFrames');
+            });
+        });
+    };
+    // Cause the error to extract the stack frames.
+    detectZone.runTask(detectZone.scheduleMacroTask('detect', detectRunFn, null, function () { return null; }, null));
     return global.Zone = Zone;
@@ -725,3 +878,4 @@ })(typeof window === 'object' && window || typeof self === 'object' && self || global);
             var data = eventTask.data;
-            if (data.handler === handler && data.useCapturing === capture && data.eventName === name) {
+            var listener = data.handler;
+            if ((data.handler === handler || listener.listener === handler) && data.useCapturing === capture && data.eventName === name) {
                 if (remove) {
@@ -736,12 +890,36 @@ eventTasks.splice(i, 1);
 }
-function attachRegisteredEvent(target, eventTask) {
+function findAllExistingRegisteredTasks(target, name, capture, remove) {
     var eventTasks = target[EVENT_TASKS];
+    if (eventTasks) {
+        var result = [];
+        for (var i = eventTasks.length - 1; i >= 0; i--) {
+            var eventTask = eventTasks[i];
+            var data = eventTask.data;
+            if (data.eventName === name && data.useCapturing === capture) {
+                result.push(eventTask);
+                if (remove) {
+                    eventTasks.splice(i, 1);
+                }
+            }
+        }
+        return result;
+    }
+    return null;
+}
+function attachRegisteredEvent(target, eventTask, isPrepend) {
+    var eventTasks = target[EVENT_TASKS];
     if (!eventTasks) {
         eventTasks = target[EVENT_TASKS] = [];
     }
-    eventTasks.push(eventTask);
+    if (isPrepend) {
+        eventTasks.unshift(eventTask);
+    }
+    else {
+        eventTasks.push(eventTask);
+    }
 }
-function makeZoneAwareAddListener(addFnName, removeFnName, useCapturingParam, allowDuplicates) {
+function makeZoneAwareAddListener(addFnName, removeFnName, useCapturingParam, allowDuplicates, isPrepend) {
     if (useCapturingParam === void 0) { useCapturingParam = true; }
     if (allowDuplicates === void 0) { allowDuplicates = false; }
+    if (isPrepend === void 0) { isPrepend = false; }
     var addFnSymbol = zoneSymbol(addFnName);
@@ -752,3 +930,3 @@ var removeFnSymbol = zoneSymbol(removeFnName);
         var meta = eventTask.data;
-        attachRegisteredEvent(meta.target, eventTask);
+        attachRegisteredEvent(meta.target, eventTask, isPrepend);
         return meta.target[addFnSymbol](meta.eventName, eventTask.invoke, meta.useCapturing);
@@ -832,2 +1010,20 @@ }
 }
+function makeZoneAwareRemoveAllListeners(fnName, useCapturingParam) {
+    if (useCapturingParam === void 0) { useCapturingParam = true; }
+    var symbol = zoneSymbol(fnName);
+    var defaultUseCapturing = useCapturingParam ? false : undefined;
+    return function zoneAwareRemoveAllListener(self, args) {
+        var eventName = args[0];
+        var useCapturing = args[1] || defaultUseCapturing;
+        var target = self || _global$1;
+        var eventTasks = findAllExistingRegisteredTasks(target, eventName, useCapturing, true);
+        if (eventTasks) {
+            for (var i = 0; i < eventTasks.length; i++) {
+                var eventTask = eventTasks[i];
+                eventTask.zone.cancelTask(eventTask);
+            }
+        }
+        target[symbol](eventName, useCapturing);
+    };
+}
 function makeZoneAwareListeners(fnName) {
@@ -889,2 +1085,8 @@ var symbol = zoneSymbol(fnName);
  */
+var callAndReturnFirstParam = function (fn) {
+    return function (self, args) {
+        fn(self, args);
+        return self;
+    };
+};
 // For EventEmitter
@@ -894,7 +1096,9 @@ var EE_ADD_LISTENER = 'addListener';
 var EE_REMOVE_LISTENER = 'removeListener';
+var EE_REMOVE_ALL_LISTENER = 'removeAllListeners';
 var EE_LISTENERS = 'listeners';
 var EE_ON = 'on';
-var zoneAwareAddListener$1 = makeZoneAwareAddListener(EE_ADD_LISTENER, EE_REMOVE_LISTENER, false, true);
-var zoneAwarePrependListener = makeZoneAwareAddListener(EE_PREPEND_LISTENER, EE_REMOVE_LISTENER, false, true);
-var zoneAwareRemoveListener$1 = makeZoneAwareRemoveListener(EE_REMOVE_LISTENER, false);
+var zoneAwareAddListener$1 = callAndReturnFirstParam(makeZoneAwareAddListener(EE_ADD_LISTENER, EE_REMOVE_LISTENER, false, true, false));
+var zoneAwarePrependListener = callAndReturnFirstParam(makeZoneAwareAddListener(EE_PREPEND_LISTENER, EE_REMOVE_LISTENER, false, true, true));
+var zoneAwareRemoveListener$1 = callAndReturnFirstParam(makeZoneAwareRemoveListener(EE_REMOVE_LISTENER, false));
+var zoneAwareRemoveAllListeners = callAndReturnFirstParam(makeZoneAwareRemoveAllListeners(EE_REMOVE_ALL_LISTENER, false));
 var zoneAwareListeners = makeZoneAwareListeners(EE_LISTENERS);
@@ -906,2 +1110,3 @@ function patchEventEmitterMethods(obj) {
         patchMethod(obj, EE_REMOVE_LISTENER, function () { return zoneAwareRemoveListener$1; });
+        patchMethod(obj, EE_REMOVE_ALL_LISTENER, function () { return zoneAwareRemoveAllListeners; });
         patchMethod(obj, EE_LISTENERS, function () { return zoneAwareListeners; });
@@ -908,0 +1113,0 @@ obj[EE_ON] = obj[EE_ADD_LISTENER];

dist/zone.js

@@ -21,628 +21,2 @@ /**
  */
-
-
-var Zone$1 = (function (global) {
-    if (global.Zone) {
-        throw new Error('Zone already loaded.');
-    }
-    var Zone = (function () {
-        function Zone(parent, zoneSpec) {
-            this._properties = null;
-            this._parent = parent;
-            this._name = zoneSpec ? zoneSpec.name || 'unnamed' : '<root>';
-            this._properties = zoneSpec && zoneSpec.properties || {};
-            this._zoneDelegate =
-                new ZoneDelegate(this, this._parent && this._parent._zoneDelegate, zoneSpec);
-        }
-        Zone.assertZonePatched = function () {
-            if (global.Promise !== ZoneAwarePromise) {
-                throw new Error('Zone.js has detected that ZoneAwarePromise `(window|global).Promise` ' +
-                    'has been overwritten.\n' +
-                    'Most likely cause is that a Promise polyfill has been loaded ' +
-                    'after Zone.js (Polyfilling Promise api is not necessary when zone.js is loaded. ' +
-                    'If you must load one, do so before loading zone.js.)');
-            }
-        };
-        Object.defineProperty(Zone, "current", {
-            get: function () {
-                return _currentZone;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        
-        Object.defineProperty(Zone, "currentTask", {
-            get: function () {
-                return _currentTask;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        
-        Object.defineProperty(Zone.prototype, "parent", {
-            get: function () {
-                return this._parent;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        
-        Object.defineProperty(Zone.prototype, "name", {
-            get: function () {
-                return this._name;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        
-        Zone.prototype.get = function (key) {
-            var zone = this.getZoneWith(key);
-            if (zone)
-                return zone._properties[key];
-        };
-        Zone.prototype.getZoneWith = function (key) {
-            var current = this;
-            while (current) {
-                if (current._properties.hasOwnProperty(key)) {
-                    return current;
-                }
-                current = current._parent;
-            }
-            return null;
-        };
-        Zone.prototype.fork = function (zoneSpec) {
-            if (!zoneSpec)
-                throw new Error('ZoneSpec required!');
-            return this._zoneDelegate.fork(this, zoneSpec);
-        };
-        Zone.prototype.wrap = function (callback, source) {
-            if (typeof callback !== 'function') {
-                throw new Error('Expecting function got: ' + callback);
-            }
-            var _callback = this._zoneDelegate.intercept(this, callback, source);
-            var zone = this;
-            return function () {
-                return zone.runGuarded(_callback, this, arguments, source);
-            };
-        };
-        Zone.prototype.run = function (callback, applyThis, applyArgs, source) {
-            if (applyThis === void 0) { applyThis = null; }
-            if (applyArgs === void 0) { applyArgs = null; }
-            if (source === void 0) { source = null; }
-            var oldZone = _currentZone;
-            _currentZone = this;
-            try {
-                return this._zoneDelegate.invoke(this, callback, applyThis, applyArgs, source);
-            }
-            finally {
-                _currentZone = oldZone;
-            }
-        };
-        Zone.prototype.runGuarded = function (callback, applyThis, applyArgs, source) {
-            if (applyThis === void 0) { applyThis = null; }
-            if (applyArgs === void 0) { applyArgs = null; }
-            if (source === void 0) { source = null; }
-            var oldZone = _currentZone;
-            _currentZone = this;
-            try {
-                try {
-                    return this._zoneDelegate.invoke(this, callback, applyThis, applyArgs, source);
-                }
-                catch (error) {
-                    if (this._zoneDelegate.handleError(this, error)) {
-                        throw error;
-                    }
-                }
-            }
-            finally {
-                _currentZone = oldZone;
-            }
-        };
-        Zone.prototype.runTask = function (task, applyThis, applyArgs) {
-            task.runCount++;
-            if (task.zone != this)
-                throw new Error('A task can only be run in the zone which created it! (Creation: ' + task.zone.name +
-                    '; Execution: ' + this.name + ')');
-            var previousTask = _currentTask;
-            _currentTask = task;
-            var oldZone = _currentZone;
-            _currentZone = this;
-            try {
-                if (task.type == 'macroTask' && task.data && !task.data.isPeriodic) {
-                    task.cancelFn = null;
-                }
-                try {
-                    return this._zoneDelegate.invokeTask(this, task, applyThis, applyArgs);
-                }
-                catch (error) {
-                    if (this._zoneDelegate.handleError(this, error)) {
-                        throw error;
-                    }
-                }
-            }
-            finally {
-                _currentZone = oldZone;
-                _currentTask = previousTask;
-            }
-        };
-        Zone.prototype.scheduleMicroTask = function (source, callback, data, customSchedule) {
-            return this._zoneDelegate.scheduleTask(this, new ZoneTask('microTask', this, source, callback, data, customSchedule, null));
-        };
-        Zone.prototype.scheduleMacroTask = function (source, callback, data, customSchedule, customCancel) {
-            return this._zoneDelegate.scheduleTask(this, new ZoneTask('macroTask', this, source, callback, data, customSchedule, customCancel));
-        };
-        Zone.prototype.scheduleEventTask = function (source, callback, data, customSchedule, customCancel) {
-            return this._zoneDelegate.scheduleTask(this, new ZoneTask('eventTask', this, source, callback, data, customSchedule, customCancel));
-        };
-        Zone.prototype.cancelTask = function (task) {
-            var value = this._zoneDelegate.cancelTask(this, task);
-            task.runCount = -1;
-            task.cancelFn = null;
-            return value;
-        };
-        Zone.__symbol__ = __symbol__;
-        return Zone;
-    }());
-    
-    var ZoneDelegate = (function () {
-        function ZoneDelegate(zone, parentDelegate, zoneSpec) {
-            this._taskCounts = { microTask: 0, macroTask: 0, eventTask: 0 };
-            this.zone = zone;
-            this._parentDelegate = parentDelegate;
-            this._forkZS = zoneSpec && (zoneSpec && zoneSpec.onFork ? zoneSpec : parentDelegate._forkZS);
-            this._forkDlgt = zoneSpec && (zoneSpec.onFork ? parentDelegate : parentDelegate._forkDlgt);
-            this._interceptZS =
-                zoneSpec && (zoneSpec.onIntercept ? zoneSpec : parentDelegate._interceptZS);
-            this._interceptDlgt =
-                zoneSpec && (zoneSpec.onIntercept ? parentDelegate : parentDelegate._interceptDlgt);
-            this._invokeZS = zoneSpec && (zoneSpec.onInvoke ? zoneSpec : parentDelegate._invokeZS);
-            this._invokeDlgt =
-                zoneSpec && (zoneSpec.onInvoke ? parentDelegate : parentDelegate._invokeDlgt);
-            this._handleErrorZS =
-                zoneSpec && (zoneSpec.onHandleError ? zoneSpec : parentDelegate._handleErrorZS);
-            this._handleErrorDlgt =
-                zoneSpec && (zoneSpec.onHandleError ? parentDelegate : parentDelegate._handleErrorDlgt);
-            this._scheduleTaskZS =
-                zoneSpec && (zoneSpec.onScheduleTask ? zoneSpec : parentDelegate._scheduleTaskZS);
-            this._scheduleTaskDlgt =
-                zoneSpec && (zoneSpec.onScheduleTask ? parentDelegate : parentDelegate._scheduleTaskDlgt);
-            this._invokeTaskZS =
-                zoneSpec && (zoneSpec.onInvokeTask ? zoneSpec : parentDelegate._invokeTaskZS);
-            this._invokeTaskDlgt =
-                zoneSpec && (zoneSpec.onInvokeTask ? parentDelegate : parentDelegate._invokeTaskDlgt);
-            this._cancelTaskZS =
-                zoneSpec && (zoneSpec.onCancelTask ? zoneSpec : parentDelegate._cancelTaskZS);
-            this._cancelTaskDlgt =
-                zoneSpec && (zoneSpec.onCancelTask ? parentDelegate : parentDelegate._cancelTaskDlgt);
-            this._hasTaskZS = zoneSpec && (zoneSpec.onHasTask ? zoneSpec : parentDelegate._hasTaskZS);
-            this._hasTaskDlgt =
-                zoneSpec && (zoneSpec.onHasTask ? parentDelegate : parentDelegate._hasTaskDlgt);
-        }
-        ZoneDelegate.prototype.fork = function (targetZone, zoneSpec) {
-            return this._forkZS ? this._forkZS.onFork(this._forkDlgt, this.zone, targetZone, zoneSpec) :
-                new Zone(targetZone, zoneSpec);
-        };
-        ZoneDelegate.prototype.intercept = function (targetZone, callback, source) {
-            return this._interceptZS ?
-                this._interceptZS.onIntercept(this._interceptDlgt, this.zone, targetZone, callback, source) :
-                callback;
-        };
-        ZoneDelegate.prototype.invoke = function (targetZone, callback, applyThis, applyArgs, source) {
-            return this._invokeZS ?
-                this._invokeZS.onInvoke(this._invokeDlgt, this.zone, targetZone, callback, applyThis, applyArgs, source) :
-                callback.apply(applyThis, applyArgs);
-        };
-        ZoneDelegate.prototype.handleError = function (targetZone, error) {
-            return this._handleErrorZS ?
-                this._handleErrorZS.onHandleError(this._handleErrorDlgt, this.zone, targetZone, error) :
-                true;
-        };
-        ZoneDelegate.prototype.scheduleTask = function (targetZone, task) {
-            try {
-                if (this._scheduleTaskZS) {
-                    return this._scheduleTaskZS.onScheduleTask(this._scheduleTaskDlgt, this.zone, targetZone, task);
-                }
-                else if (task.scheduleFn) {
-                    task.scheduleFn(task);
-                }
-                else if (task.type == 'microTask') {
-                    scheduleMicroTask(task);
-                }
-                else {
-                    throw new Error('Task is missing scheduleFn.');
-                }
-                return task;
-            }
-            finally {
-                if (targetZone == this.zone) {
-                    this._updateTaskCount(task.type, 1);
-                }
-            }
-        };
-        ZoneDelegate.prototype.invokeTask = function (targetZone, task, applyThis, applyArgs) {
-            try {
-                return this._invokeTaskZS ?
-                    this._invokeTaskZS.onInvokeTask(this._invokeTaskDlgt, this.zone, targetZone, task, applyThis, applyArgs) :
-                    task.callback.apply(applyThis, applyArgs);
-            }
-            finally {
-                if (targetZone == this.zone && (task.type != 'eventTask') &&
-                    !(task.data && task.data.isPeriodic)) {
-                    this._updateTaskCount(task.type, -1);
-                }
-            }
-        };
-        ZoneDelegate.prototype.cancelTask = function (targetZone, task) {
-            var value;
-            if (this._cancelTaskZS) {
-                value = this._cancelTaskZS.onCancelTask(this._cancelTaskDlgt, this.zone, targetZone, task);
-            }
-            else if (!task.cancelFn) {
-                throw new Error('Task does not support cancellation, or is already canceled.');
-            }
-            else {
-                value = task.cancelFn(task);
-            }
-            if (targetZone == this.zone) {
-                // this should not be in the finally block, because exceptions assume not canceled.
-                this._updateTaskCount(task.type, -1);
-            }
-            return value;
-        };
-        ZoneDelegate.prototype.hasTask = function (targetZone, isEmpty) {
-            return this._hasTaskZS &&
-                this._hasTaskZS.onHasTask(this._hasTaskDlgt, this.zone, targetZone, isEmpty);
-        };
-        ZoneDelegate.prototype._updateTaskCount = function (type, count) {
-            var counts = this._taskCounts;
-            var prev = counts[type];
-            var next = counts[type] = prev + count;
-            if (next < 0) {
-                throw new Error('More tasks executed then were scheduled.');
-            }
-            if (prev == 0 || next == 0) {
-                var isEmpty = {
-                    microTask: counts.microTask > 0,
-                    macroTask: counts.macroTask > 0,
-                    eventTask: counts.eventTask > 0,
-                    change: type
-                };
-                try {
-                    this.hasTask(this.zone, isEmpty);
-                }
-                finally {
-                    if (this._parentDelegate) {
-                        this._parentDelegate._updateTaskCount(type, count);
-                    }
-                }
-            }
-        };
-        return ZoneDelegate;
-    }());
-    var ZoneTask = (function () {
-        function ZoneTask(type, zone, source, callback, options, scheduleFn, cancelFn) {
-            this.runCount = 0;
-            this.type = type;
-            this.zone = zone;
-            this.source = source;
-            this.data = options;
-            this.scheduleFn = scheduleFn;
-            this.cancelFn = cancelFn;
-            this.callback = callback;
-            var self = this;
-            this.invoke = function () {
-                _numberOfNestedTaskFrames++;
-                try {
-                    return zone.runTask(self, this, arguments);
-                }
-                finally {
-                    if (_numberOfNestedTaskFrames == 1) {
-                        drainMicroTaskQueue();
-                    }
-                    _numberOfNestedTaskFrames--;
-                }
-            };
-        }
-        ZoneTask.prototype.toString = function () {
-            if (this.data && typeof this.data.handleId !== 'undefined') {
-                return this.data.handleId;
-            }
-            else {
-                return Object.prototype.toString.call(this);
-            }
-        };
-        return ZoneTask;
-    }());
-    function __symbol__(name) {
-        return '__zone_symbol__' + name;
-    }
-    
-    var symbolSetTimeout = __symbol__('setTimeout');
-    var symbolPromise = __symbol__('Promise');
-    var symbolThen = __symbol__('then');
-    var _currentZone = new Zone(null, null);
-    var _currentTask = null;
-    var _microTaskQueue = [];
-    var _isDrainingMicrotaskQueue = false;
-    var _uncaughtPromiseErrors = [];
-    var _numberOfNestedTaskFrames = 0;
-    function scheduleQueueDrain() {
-        // if we are not running in any task, and there has not been anything scheduled
-        // we must bootstrap the initial task creation by manually scheduling the drain
-        if (_numberOfNestedTaskFrames == 0 && _microTaskQueue.length == 0) {
-            // We are not running in Task, so we need to kickstart the microtask queue.
-            if (global[symbolPromise]) {
-                global[symbolPromise].resolve(0)[symbolThen](drainMicroTaskQueue);
-            }
-            else {
-                global[symbolSetTimeout](drainMicroTaskQueue, 0);
-            }
-        }
-    }
-    function scheduleMicroTask(task) {
-        scheduleQueueDrain();
-        _microTaskQueue.push(task);
-    }
-    function consoleError(e) {
-        var rejection = e && e.rejection;
-        if (rejection) {
-            console.error('Unhandled Promise rejection:', rejection instanceof Error ? rejection.message : rejection, '; Zone:', e.zone.name, '; Task:', e.task && e.task.source, '; Value:', rejection, rejection instanceof Error ? rejection.stack : undefined);
-        }
-        console.error(e);
-    }
-    function drainMicroTaskQueue() {
-        if (!_isDrainingMicrotaskQueue) {
-            _isDrainingMicrotaskQueue = true;
-            while (_microTaskQueue.length) {
-                var queue = _microTaskQueue;
-                _microTaskQueue = [];
-                for (var i = 0; i < queue.length; i++) {
-                    var task = queue[i];
-                    try {
-                        task.zone.runTask(task, null, null);
-                    }
-                    catch (e) {
-                        consoleError(e);
-                    }
-                }
-            }
-            while (_uncaughtPromiseErrors.length) {
-                var _loop_1 = function() {
-                    var uncaughtPromiseError = _uncaughtPromiseErrors.shift();
-                    try {
-                        uncaughtPromiseError.zone.runGuarded(function () {
-                            throw uncaughtPromiseError;
-                        });
-                    }
-                    catch (e) {
-                        consoleError(e);
-                    }
-                };
-                while (_uncaughtPromiseErrors.length) {
-                    _loop_1();
-                }
-            }
-            _isDrainingMicrotaskQueue = false;
-        }
-    }
-    function isThenable(value) {
-        return value && value.then;
-    }
-    function forwardResolution(value) {
-        return value;
-    }
-    function forwardRejection(rejection) {
-        return ZoneAwarePromise.reject(rejection);
-    }
-    var symbolState = __symbol__('state');
-    var symbolValue = __symbol__('value');
-    var source = 'Promise.then';
-    var UNRESOLVED = null;
-    var RESOLVED = true;
-    var REJECTED = false;
-    var REJECTED_NO_CATCH = 0;
-    function makeResolver(promise, state) {
-        return function (v) {
-            resolvePromise(promise, state, v);
-            // Do not return value or you will break the Promise spec.
-        };
-    }
-    function resolvePromise(promise, state, value) {
-        if (promise[symbolState] === UNRESOLVED) {
-            if (value instanceof ZoneAwarePromise && value[symbolState] !== UNRESOLVED) {
-                clearRejectedNoCatch(value);
-                resolvePromise(promise, value[symbolState], value[symbolValue]);
-            }
-            else if (isThenable(value)) {
-                value.then(makeResolver(promise, state), makeResolver(promise, false));
-            }
-            else {
-                promise[symbolState] = state;
-                var queue = promise[symbolValue];
-                promise[symbolValue] = value;
-                for (var i = 0; i < queue.length;) {
-                    scheduleResolveOrReject(promise, queue[i++], queue[i++], queue[i++], queue[i++]);
-                }
-                if (queue.length == 0 && state == REJECTED) {
-                    promise[symbolState] = REJECTED_NO_CATCH;
-                    try {
-                        throw new Error('Uncaught (in promise): ' + value +
-                            (value && value.stack ? '\n' + value.stack : ''));
-                    }
-                    catch (e) {
-                        var error_1 = e;
-                        error_1.rejection = value;
-                        error_1.promise = promise;
-                        error_1.zone = Zone.current;
-                        error_1.task = Zone.currentTask;
-                        _uncaughtPromiseErrors.push(error_1);
-                        scheduleQueueDrain();
-                    }
-                }
-            }
-        }
-        // Resolving an already resolved promise is a noop.
-        return promise;
-    }
-    function clearRejectedNoCatch(promise) {
-        if (promise[symbolState] === REJECTED_NO_CATCH) {
-            promise[symbolState] = REJECTED;
-            for (var i = 0; i < _uncaughtPromiseErrors.length; i++) {
-                if (promise === _uncaughtPromiseErrors[i].promise) {
-                    _uncaughtPromiseErrors.splice(i, 1);
-                    break;
-                }
-            }
-        }
-    }
-    function scheduleResolveOrReject(promise, zone, chainPromise, onFulfilled, onRejected) {
-        clearRejectedNoCatch(promise);
-        var delegate = promise[symbolState] ? onFulfilled || forwardResolution : onRejected || forwardRejection;
-        zone.scheduleMicroTask(source, function () {
-            try {
-                resolvePromise(chainPromise, true, zone.run(delegate, null, [promise[symbolValue]]));
-            }
-            catch (error) {
-                resolvePromise(chainPromise, false, error);
-            }
-        });
-    }
-    var ZoneAwarePromise = (function () {
-        function ZoneAwarePromise(executor) {
-            var promise = this;
-            if (!(promise instanceof ZoneAwarePromise)) {
-                throw new Error('Must be an instanceof Promise.');
-            }
-            promise[symbolState] = UNRESOLVED;
-            promise[symbolValue] = []; // queue;
-            try {
-                executor && executor(makeResolver(promise, RESOLVED), makeResolver(promise, REJECTED));
-            }
-            catch (e) {
-                resolvePromise(promise, false, e);
-            }
-        }
-        ZoneAwarePromise.resolve = function (value) {
-            return resolvePromise(new this(null), RESOLVED, value);
-        };
-        ZoneAwarePromise.reject = function (error) {
-            return resolvePromise(new this(null), REJECTED, error);
-        };
-        ZoneAwarePromise.race = function (values) {
-            var resolve;
-            var reject;
-            var promise = new this(function (res, rej) {
-                _a = [res, rej], resolve = _a[0], reject = _a[1];
-                var _a;
-            });
-            function onResolve(value) {
-                promise && (promise = null || resolve(value));
-            }
-            function onReject(error) {
-                promise && (promise = null || reject(error));
-            }
-            for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
-                var value = values_1[_i];
-                if (!isThenable(value)) {
-                    value = this.resolve(value);
-                }
-                value.then(onResolve, onReject);
-            }
-            return promise;
-        };
-        ZoneAwarePromise.all = function (values) {
-            var resolve;
-            var reject;
-            var promise = new this(function (res, rej) {
-                resolve = res;
-                reject = rej;
-            });
-            var count = 0;
-            var resolvedValues = [];
-            for (var _i = 0, values_2 = values; _i < values_2.length; _i++) {
-                var value = values_2[_i];
-                if (!isThenable(value)) {
-                    value = this.resolve(value);
-                }
-                value.then((function (index) { return function (value) {
-                    resolvedValues[index] = value;
-                    count--;
-                    if (!count) {
-                        resolve(resolvedValues);
-                    }
-                }; })(count), reject);
-                count++;
-            }
-            if (!count)
-                resolve(resolvedValues);
-            return promise;
-        };
-        ZoneAwarePromise.prototype.then = function (onFulfilled, onRejected) {
-            var chainPromise = new this.constructor(null);
-            var zone = Zone.current;
-            if (this[symbolState] == UNRESOLVED) {
-                this[symbolValue].push(zone, chainPromise, onFulfilled, onRejected);
-            }
-            else {
-                scheduleResolveOrReject(this, zone, chainPromise, onFulfilled, onRejected);
-            }
-            return chainPromise;
-        };
-        ZoneAwarePromise.prototype.catch = function (onRejected) {
-            return this.then(null, onRejected);
-        };
-        return ZoneAwarePromise;
-    }());
-    // Protect against aggressive optimizers dropping seemingly unused properties.
-    // E.g. Closure Compiler in advanced mode.
-    ZoneAwarePromise['resolve'] = ZoneAwarePromise.resolve;
-    ZoneAwarePromise['reject'] = ZoneAwarePromise.reject;
-    ZoneAwarePromise['race'] = ZoneAwarePromise.race;
-    ZoneAwarePromise['all'] = ZoneAwarePromise.all;
-    var NativePromise = global[__symbol__('Promise')] = global.Promise;
-    global.Promise = ZoneAwarePromise;
-    function patchThen(NativePromise) {
-        var NativePromiseProtototype = NativePromise.prototype;
-        var NativePromiseThen = NativePromiseProtototype[__symbol__('then')] =
-            NativePromiseProtototype.then;
-        NativePromiseProtototype.then = function (onResolve, onReject) {
-            var nativePromise = this;
-            return new ZoneAwarePromise(function (resolve, reject) {
-                NativePromiseThen.call(nativePromise, resolve, reject);
-            })
-                .then(onResolve, onReject);
-        };
-    }
-    if (NativePromise) {
-        patchThen(NativePromise);
-        if (typeof global['fetch'] !== 'undefined') {
-            var fetchPromise = void 0;
-            try {
-                // In MS Edge this throws
-                fetchPromise = global['fetch']();
-            }
-            catch (e) {
-                // In Chrome this throws instead.
-                fetchPromise = global['fetch']('about:blank');
-            }
-            // ignore output to prevent error;
-            fetchPromise.then(function () { return null; }, function () { return null; });
-            if (fetchPromise.constructor != NativePromise &&
-                fetchPromise.constructor != ZoneAwarePromise) {
-                patchThen(fetchPromise.constructor);
-            }
-        }
-    }
-    // This is not part of public API, but it is usefull for tests, so we expose it.
-    Promise[Zone.__symbol__('uncaughtPromiseErrors')] = _uncaughtPromiseErrors;
-    return global.Zone = Zone;
-})(typeof window === 'object' && window || typeof self === 'object' && self || global);
-
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
 var zoneSymbol = Zone['__symbol__'];
@@ -745,3 +119,4 @@ var _global$1 = typeof window === 'object' && window || typeof self === 'object' && self || global;
             var data = eventTask.data;
-            if (data.handler === handler && data.useCapturing === capture && data.eventName === name) {
+            var listener = data.handler;
+            if ((data.handler === handler || listener.listener === handler) && data.useCapturing === capture && data.eventName === name) {
                 if (remove) {
@@ -756,12 +131,36 @@ eventTasks.splice(i, 1);
 }
-function attachRegisteredEvent(target, eventTask) {
+function findAllExistingRegisteredTasks(target, name, capture, remove) {
     var eventTasks = target[EVENT_TASKS];
+    if (eventTasks) {
+        var result = [];
+        for (var i = eventTasks.length - 1; i >= 0; i--) {
+            var eventTask = eventTasks[i];
+            var data = eventTask.data;
+            if (data.eventName === name && data.useCapturing === capture) {
+                result.push(eventTask);
+                if (remove) {
+                    eventTasks.splice(i, 1);
+                }
+            }
+        }
+        return result;
+    }
+    return null;
+}
+function attachRegisteredEvent(target, eventTask, isPrepend) {
+    var eventTasks = target[EVENT_TASKS];
     if (!eventTasks) {
         eventTasks = target[EVENT_TASKS] = [];
     }
-    eventTasks.push(eventTask);
+    if (isPrepend) {
+        eventTasks.unshift(eventTask);
+    }
+    else {
+        eventTasks.push(eventTask);
+    }
 }
-function makeZoneAwareAddListener(addFnName, removeFnName, useCapturingParam, allowDuplicates) {
+function makeZoneAwareAddListener(addFnName, removeFnName, useCapturingParam, allowDuplicates, isPrepend) {
     if (useCapturingParam === void 0) { useCapturingParam = true; }
     if (allowDuplicates === void 0) { allowDuplicates = false; }
+    if (isPrepend === void 0) { isPrepend = false; }
     var addFnSymbol = zoneSymbol(addFnName);
@@ -772,3 +171,3 @@ var removeFnSymbol = zoneSymbol(removeFnName);
         var meta = eventTask.data;
-        attachRegisteredEvent(meta.target, eventTask);
+        attachRegisteredEvent(meta.target, eventTask, isPrepend);
         return meta.target[addFnSymbol](meta.eventName, eventTask.invoke, meta.useCapturing);
@@ -853,2 +252,3 @@ }
 
+
 var zoneAwareAddEventListener = makeZoneAwareAddListener(ADD_EVENT_LISTENER, REMOVE_EVENT_LISTENER);
@@ -1140,3 +540,3 @@ var zoneAwareRemoveEventListener = makeZoneAwareRemoveListener(REMOVE_EVENT_LISTENER);
 var WTF_ISSUE_555 = 'Anchor,Area,Audio,BR,Base,BaseFont,Body,Button,Canvas,Content,DList,Directory,Div,Embed,FieldSet,Font,Form,Frame,FrameSet,HR,Head,Heading,Html,IFrame,Image,Input,Keygen,LI,Label,Legend,Link,Map,Marquee,Media,Menu,Meta,Meter,Mod,OList,Object,OptGroup,Option,Output,Paragraph,Pre,Progress,Quote,Script,Select,Source,Span,Style,TableCaption,TableCell,TableCol,Table,TableRow,TableSection,TextArea,Title,Track,UList,Unknown,Video';
-var NO_EVENT_TARGET = 'ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex'
+var NO_EVENT_TARGET = 'ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex,WebSocket'
     .split(',');
@@ -1143,0 +543,0 @@ var EVENT_TARGET = 'EventTarget';

dist/zone.min.js

@@ -1,1 +0,1 @@
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";function e(e,t){for(var n=e.length-1;n>=0;n--)"function"==typeof e[n]&&(e[n]=Zone.current.wrap(e[n],t+"_"+n));return e}function t(t,n){for(var r=t.constructor.name,o=function(o){var a=n[o],i=t[a];i&&(t[a]=function(t){return function(){return t.apply(this,e(arguments,r+"."+a))}}(i))},a=0;a<n.length;a++)o(a)}function n(e,t){var n=Object.getOwnPropertyDescriptor(e,t)||{enumerable:!0,configurable:!0};delete n.writable,delete n.value;var r=t.substr(2),o="_"+t;n.set=function(e){if(this[o]&&this.removeEventListener(r,this[o]),"function"==typeof e){var t=function(t){var n;n=e.apply(this,arguments),void 0==n||n||t.preventDefault()};this[o]=t,this.addEventListener(r,t,!1)}else this[o]=null},n.get=function(){return this[o]||null},Object.defineProperty(e,t,n)}function r(e,t){var r=[];for(var o in e)"on"==o.substr(0,2)&&r.push(o);for(var a=0;a<r.length;a++)n(e,r[a]);if(t)for(var i=0;i<t.length;i++)n(e,"on"+t[i])}function o(e,t,n,r,o){var a=e[j];if(a)for(var i=0;i<a.length;i++){var s=a[i],u=s.data;if(u.handler===t&&u.useCapturing===r&&u.eventName===n)return o&&a.splice(i,1),s}return null}function a(e,t){var n=e[j];n||(n=e[j]=[]),n.push(t)}function i(e,t,n,r){function i(e){var t=e.data;return a(t.target,e),t.target[u](t.eventName,e.invoke,t.useCapturing)}function s(e){var t=e.data;o(t.target,e.invoke,t.eventName,t.useCapturing,!0),t.target[c](t.eventName,e.invoke,t.useCapturing)}void 0===n&&(n=!0),void 0===r&&(r=!1);var u=E(e),c=E(t),l=!n&&void 0;return function(t,n){var a=n[0],c=n[1],f=n[2]||l,p=t||S,h=null;"function"==typeof c?h=c:c&&c.handleEvent&&(h=function(e){return c.handleEvent(e)});var d=!1;try{d=c&&"[object FunctionWrapper]"===c.toString()}catch(v){return}if(!h||d)return p[u](a,c,f);if(!r){var g=o(p,c,a,f,!1);if(g)return p[u](a,g.invoke,f)}var y=Zone.current,k=p.constructor.name+"."+e+":"+a,b={target:p,eventName:a,name:a,useCapturing:f,handler:c};y.scheduleEventTask(k,h,b,i,s)}}function s(e,t){void 0===t&&(t=!0);var n=E(e),r=!t&&void 0;return function(e,t){var a=t[0],i=t[1],s=t[2]||r,u=e||S,c=o(u,i,a,s,!0);c?c.zone.cancelTask(c):u[n](a,i,s)}}function u(e){return!(!e||!e.addEventListener)&&(f(e,z,function(){return C}),f(e,I,function(){return M}),!0)}function c(t){var n=S[t];if(n){S[t]=function(){var r=e(arguments,t);switch(r.length){case 0:this[L]=new n;break;case 1:this[L]=new n(r[0]);break;case 2:this[L]=new n(r[0],r[1]);break;case 3:this[L]=new n(r[0],r[1],r[2]);break;case 4:this[L]=new n(r[0],r[1],r[2],r[3]);break;default:throw new Error("Arg list too long.")}};var r,o=new n(function(){});for(r in o)"XMLHttpRequest"===t&&"responseBlob"===r||!function(e){"function"==typeof o[e]?S[t].prototype[e]=function(){return this[L][e].apply(this[L],arguments)}:Object.defineProperty(S[t].prototype,e,{set:function(n){"function"==typeof n?this[L][e]=Zone.current.wrap(n,t+"."+e):this[L][e]=n},get:function(){return this[L][e]}})}(r);for(r in n)"prototype"!==r&&n.hasOwnProperty(r)&&(S[t][r]=n[r])}}function l(e,t){try{return Function("f","return function "+e+"(){return f(this, arguments)}")(t)}catch(n){return function(){return t(this,arguments)}}}function f(e,t,n){for(var r=e;r&&Object.getOwnPropertyNames(r).indexOf(t)===-1;)r=Object.getPrototypeOf(r);!r&&e[t]&&(r=e);var o,a=E(t);return r&&!(o=r[a])&&(o=r[a]=r[t],r[t]=l(t,n(o,a,t))),o}function p(e,t,n,r){function o(t){var n=t.data;return n.args[0]=function(){t.invoke.apply(this,arguments),delete u[n.handleId]},n.handleId=i.apply(e,n.args),u[n.handleId]=t,t}function a(e){return delete u[e.data.handleId],s(e.data.handleId)}var i=null,s=null;t+=r,n+=r;var u={};i=f(e,t,function(n){return function(i,s){if("function"==typeof s[0]){var u=Zone.current,c={handleId:null,isPeriodic:"Interval"===r,delay:"Timeout"===r||"Interval"===r?s[1]||0:null,args:s},l=u.scheduleMacroTask(t,s[0],c,o,a);if(!l)return l;var f=l.data.handleId;return f.ref&&f.unref&&(l.ref=f.ref.bind(f),l.unref=f.unref.bind(f)),l}return n.apply(e,s)}}),s=f(e,n,function(t){return function(n,r){var o="number"==typeof r[0]?u[r[0]]:r[0];o&&"string"==typeof o.type?(o.cancelFn&&o.data.isPeriodic||0===o.runCount)&&o.zone.cancelTask(o):t.apply(e,r)}})}function h(){Object.defineProperty=function(e,t,n){if(v(e,t))throw new TypeError("Cannot assign to read only property '"+t+"' of "+e);var r=n.configurable;return"prototype"!==t&&(n=g(e,t,n)),y(e,t,n,r)},Object.defineProperties=function(e,t){return Object.keys(t).forEach(function(n){Object.defineProperty(e,n,t[n])}),e},Object.create=function(e,t){return"object"!=typeof t||Object.isFrozen(t)||Object.keys(t).forEach(function(n){t[n]=g(e,n,t[n])}),R(e,t)},Object.getOwnPropertyDescriptor=function(e,t){var n=H(e,t);return v(e,t)&&(n.configurable=!1),n}}function d(e,t,n){var r=n.configurable;return n=g(e,t,n),y(e,t,n,r)}function v(e,t){return e&&e[q]&&e[q][t]}function g(e,t,n){return n.configurable=!0,n.configurable||(e[q]||F(e,q,{writable:!0,value:{}}),e[q][t]=!0),n}function y(e,t,n,r){try{return F(e,t,n)}catch(o){if(!n.configurable)throw o;"undefined"==typeof r?delete n.configurable:n.configurable=r;try{return F(e,t,n)}catch(o){var a=null;try{a=JSON.stringify(n)}catch(o){a=a.toString()}console.log("Attempting to configure '"+t+"' with descriptor '"+a+"' on object '"+e+"' and got error, giving up: "+o)}}}function k(e){var t=[],n=e.wtf;n?t=B.split(",").map(function(e){return"HTML"+e+"Element"}).concat(x):e[W]?t.push(W):t=x;for(var r=0;r<t.length;r++){var o=e[t[r]];u(o&&o.prototype)}}function b(e){var t=e.WebSocket;e.EventTarget||u(t.prototype),e.WebSocket=function(e,n){var o,a=arguments.length>1?new t(e,n):new t(e),i=Object.getOwnPropertyDescriptor(a,"onmessage");return i&&i.configurable===!1?(o=Object.create(a),["addEventListener","removeEventListener","send","close"].forEach(function(e){o[e]=function(){return a[e].apply(a,arguments)}})):o=a,r(o,["close","error","message","open"]),o};for(var n in t)e.WebSocket[n]=t[n]}function m(e){if(!P){var t="undefined"!=typeof WebSocket;T()?(Z&&r(HTMLElement.prototype,X),r(XMLHttpRequest.prototype,null),"undefined"!=typeof IDBIndex&&(r(IDBIndex.prototype,null),r(IDBRequest.prototype,null),r(IDBOpenDBRequest.prototype,null),r(IDBDatabase.prototype,null),r(IDBTransaction.prototype,null),r(IDBCursor.prototype,null)),t&&r(WebSocket.prototype,null)):(w(),c("XMLHttpRequest"),t&&b(e))}}function T(){if(Z&&!Object.getOwnPropertyDescriptor(HTMLElement.prototype,"onclick")&&"undefined"!=typeof Element){var e=Object.getOwnPropertyDescriptor(Element.prototype,"onclick");if(e&&!e.configurable)return!1}Object.defineProperty(XMLHttpRequest.prototype,"onreadystatechange",{get:function(){return!0}});var t=new XMLHttpRequest,n=!!t.onreadystatechange;return Object.defineProperty(XMLHttpRequest.prototype,"onreadystatechange",{}),n}function w(){for(var e=function(e){var t=X[e],n="on"+t;self.addEventListener(t,function(e){var t,r,o=e.target;for(r=o?o.constructor.name+"."+n:"unknown."+n;o;)o[n]&&!o[n][A]&&(t=Zone.current.wrap(o[n],r),t[A]=o[n],o[n]=t),o=o.parentElement},!0)},t=0;t<X.length;t++)e(t)}function _(e){if(Z&&"registerElement"in e.document){var t=document.registerElement,n=["createdCallback","attachedCallback","detachedCallback","attributeChangedCallback"];document.registerElement=function(e,r){return r&&r.prototype&&n.forEach(function(e){var t="Document.registerElement::"+e;if(r.prototype.hasOwnProperty(e)){var n=Object.getOwnPropertyDescriptor(r.prototype,e);n&&n.value?(n.value=Zone.current.wrap(n.value,t),d(r.prototype,e,n)):r.prototype[e]=Zone.current.wrap(r.prototype[e],t)}else r.prototype[e]&&(r.prototype[e]=Zone.current.wrap(r.prototype[e],t))}),t.apply(document,[e,r])}}}function D(e){function t(e){var t=e[Q];return t}function n(e){var t=e.data;t.target.addEventListener("readystatechange",function(){t.target.readyState===t.target.DONE&&(t.aborted||e.invoke())});var n=t.target[Q];return n||(t.target[Q]=e),i.apply(t.target,t.args),e}function r(){}function o(e){var t=e.data;return t.aborted=!0,s.apply(t.target,t.args)}var a=f(e.XMLHttpRequest.prototype,"open",function(){return function(e,t){return e[Y]=0==t[2],a.apply(e,t)}}),i=f(e.XMLHttpRequest.prototype,"send",function(){return function(e,t){var a=Zone.current;if(e[Y])return i.apply(e,t);var s={target:e,isPeriodic:!1,delay:null,args:t,aborted:!1};return a.scheduleMacroTask("XMLHttpRequest.send",r,s,n,o)}}),s=f(e.XMLHttpRequest.prototype,"abort",function(e){return function(e,n){var r=t(e);if(r&&"string"==typeof r.type){if(null==r.cancelFn)return;r.zone.cancelTask(r)}}})}var E=(function(e){function t(e){return"__zone_symbol__"+e}function n(){0==E&&0==w.length&&(e[k]?e[k].resolve(0)[b](a):e[y](a,0))}function r(e){n(),w.push(e)}function o(e){var t=e&&e.rejection;t&&console.error("Unhandled Promise rejection:",t instanceof Error?t.message:t,"; Zone:",e.zone.name,"; Task:",e.task&&e.task.source,"; Value:",t,t instanceof Error?t.stack:void 0),console.error(e)}function a(){if(!_){for(_=!0;w.length;){var e=w;w=[];for(var t=0;t<e.length;t++){var n=e[t];try{n.zone.runTask(n,null,null)}catch(r){o(r)}}}for(;D.length;)for(var a=function(){var e=D.shift();try{e.zone.runGuarded(function(){throw e})}catch(t){o(t)}};D.length;)a();_=!1}}function i(e){return e&&e.then}function s(e){return e}function u(e){return C.reject(e)}function c(e,t){return function(n){l(e,t,n)}}function l(e,t,r){if(e[S]===Z)if(r instanceof C&&r[S]!==Z)f(r),l(e,r[S],r[O]);else if(i(r))r.then(c(e,t),c(e,!1));else{e[S]=t;var o=e[O];e[O]=r;for(var a=0;a<o.length;)p(e,o[a++],o[a++],o[a++],o[a++]);if(0==o.length&&t==z){e[S]=I;try{throw new Error("Uncaught (in promise): "+r+(r&&r.stack?"\n"+r.stack:""))}catch(s){var u=s;u.rejection=r,u.promise=e,u.zone=d.current,u.task=d.currentTask,D.push(u),n()}}}return e}function f(e){if(e[S]===I){e[S]=z;for(var t=0;t<D.length;t++)if(e===D[t].promise){D.splice(t,1);break}}}function p(e,t,n,r,o){f(e);var a=e[S]?r||s:o||u;t.scheduleMicroTask(P,function(){try{l(n,!0,t.run(a,null,[e[O]]))}catch(r){l(n,!1,r)}})}function h(e){var n=e.prototype,r=n[t("then")]=n.then;n.then=function(e,t){var n=this;return new C(function(e,t){r.call(n,e,t)}).then(e,t)}}if(e.Zone)throw new Error("Zone already loaded.");var d=function(){function n(e,t){this._properties=null,this._parent=e,this._name=t?t.name||"unnamed":"<root>",this._properties=t&&t.properties||{},this._zoneDelegate=new v(this,this._parent&&this._parent._zoneDelegate,t)}return n.assertZonePatched=function(){if(e.Promise!==C)throw new Error("Zone.js has detected that ZoneAwarePromise `(window|global).Promise` has been overwritten.\nMost likely cause is that a Promise polyfill has been loaded after Zone.js (Polyfilling Promise api is not necessary when zone.js is loaded. If you must load one, do so before loading zone.js.)")},Object.defineProperty(n,"current",{get:function(){return m},enumerable:!0,configurable:!0}),Object.defineProperty(n,"currentTask",{get:function(){return T},enumerable:!0,configurable:!0}),Object.defineProperty(n.prototype,"parent",{get:function(){return this._parent},enumerable:!0,configurable:!0}),Object.defineProperty(n.prototype,"name",{get:function(){return this._name},enumerable:!0,configurable:!0}),n.prototype.get=function(e){var t=this.getZoneWith(e);if(t)return t._properties[e]},n.prototype.getZoneWith=function(e){for(var t=this;t;){if(t._properties.hasOwnProperty(e))return t;t=t._parent}return null},n.prototype.fork=function(e){if(!e)throw new Error("ZoneSpec required!");return this._zoneDelegate.fork(this,e)},n.prototype.wrap=function(e,t){if("function"!=typeof e)throw new Error("Expecting function got: "+e);var n=this._zoneDelegate.intercept(this,e,t),r=this;return function(){return r.runGuarded(n,this,arguments,t)}},n.prototype.run=function(e,t,n,r){void 0===t&&(t=null),void 0===n&&(n=null),void 0===r&&(r=null);var o=m;m=this;try{return this._zoneDelegate.invoke(this,e,t,n,r)}finally{m=o}},n.prototype.runGuarded=function(e,t,n,r){void 0===t&&(t=null),void 0===n&&(n=null),void 0===r&&(r=null);var o=m;m=this;try{try{return this._zoneDelegate.invoke(this,e,t,n,r)}catch(a){if(this._zoneDelegate.handleError(this,a))throw a}}finally{m=o}},n.prototype.runTask=function(e,t,n){if(e.runCount++,e.zone!=this)throw new Error("A task can only be run in the zone which created it! (Creation: "+e.zone.name+"; Execution: "+this.name+")");var r=T;T=e;var o=m;m=this;try{"macroTask"==e.type&&e.data&&!e.data.isPeriodic&&(e.cancelFn=null);try{return this._zoneDelegate.invokeTask(this,e,t,n)}catch(a){if(this._zoneDelegate.handleError(this,a))throw a}}finally{m=o,T=r}},n.prototype.scheduleMicroTask=function(e,t,n,r){return this._zoneDelegate.scheduleTask(this,new g("microTask",this,e,t,n,r,null))},n.prototype.scheduleMacroTask=function(e,t,n,r,o){return this._zoneDelegate.scheduleTask(this,new g("macroTask",this,e,t,n,r,o))},n.prototype.scheduleEventTask=function(e,t,n,r,o){return this._zoneDelegate.scheduleTask(this,new g("eventTask",this,e,t,n,r,o))},n.prototype.cancelTask=function(e){var t=this._zoneDelegate.cancelTask(this,e);return e.runCount=-1,e.cancelFn=null,t},n.__symbol__=t,n}(),v=function(){function e(e,t,n){this._taskCounts={microTask:0,macroTask:0,eventTask:0},this.zone=e,this._parentDelegate=t,this._forkZS=n&&(n&&n.onFork?n:t._forkZS),this._forkDlgt=n&&(n.onFork?t:t._forkDlgt),this._interceptZS=n&&(n.onIntercept?n:t._interceptZS),this._interceptDlgt=n&&(n.onIntercept?t:t._interceptDlgt),this._invokeZS=n&&(n.onInvoke?n:t._invokeZS),this._invokeDlgt=n&&(n.onInvoke?t:t._invokeDlgt),this._handleErrorZS=n&&(n.onHandleError?n:t._handleErrorZS),this._handleErrorDlgt=n&&(n.onHandleError?t:t._handleErrorDlgt),this._scheduleTaskZS=n&&(n.onScheduleTask?n:t._scheduleTaskZS),this._scheduleTaskDlgt=n&&(n.onScheduleTask?t:t._scheduleTaskDlgt),this._invokeTaskZS=n&&(n.onInvokeTask?n:t._invokeTaskZS),this._invokeTaskDlgt=n&&(n.onInvokeTask?t:t._invokeTaskDlgt),this._cancelTaskZS=n&&(n.onCancelTask?n:t._cancelTaskZS),this._cancelTaskDlgt=n&&(n.onCancelTask?t:t._cancelTaskDlgt),this._hasTaskZS=n&&(n.onHasTask?n:t._hasTaskZS),this._hasTaskDlgt=n&&(n.onHasTask?t:t._hasTaskDlgt)}return e.prototype.fork=function(e,t){return this._forkZS?this._forkZS.onFork(this._forkDlgt,this.zone,e,t):new d(e,t)},e.prototype.intercept=function(e,t,n){return this._interceptZS?this._interceptZS.onIntercept(this._interceptDlgt,this.zone,e,t,n):t},e.prototype.invoke=function(e,t,n,r,o){return this._invokeZS?this._invokeZS.onInvoke(this._invokeDlgt,this.zone,e,t,n,r,o):t.apply(n,r)},e.prototype.handleError=function(e,t){return!this._handleErrorZS||this._handleErrorZS.onHandleError(this._handleErrorDlgt,this.zone,e,t)},e.prototype.scheduleTask=function(e,t){try{if(this._scheduleTaskZS)return this._scheduleTaskZS.onScheduleTask(this._scheduleTaskDlgt,this.zone,e,t);if(t.scheduleFn)t.scheduleFn(t);else{if("microTask"!=t.type)throw new Error("Task is missing scheduleFn.");r(t)}return t}finally{e==this.zone&&this._updateTaskCount(t.type,1)}},e.prototype.invokeTask=function(e,t,n,r){try{return this._invokeTaskZS?this._invokeTaskZS.onInvokeTask(this._invokeTaskDlgt,this.zone,e,t,n,r):t.callback.apply(n,r)}finally{e!=this.zone||"eventTask"==t.type||t.data&&t.data.isPeriodic||this._updateTaskCount(t.type,-1)}},e.prototype.cancelTask=function(e,t){var n;if(this._cancelTaskZS)n=this._cancelTaskZS.onCancelTask(this._cancelTaskDlgt,this.zone,e,t);else{if(!t.cancelFn)throw new Error("Task does not support cancellation, or is already canceled.");n=t.cancelFn(t)}return e==this.zone&&this._updateTaskCount(t.type,-1),n},e.prototype.hasTask=function(e,t){return this._hasTaskZS&&this._hasTaskZS.onHasTask(this._hasTaskDlgt,this.zone,e,t)},e.prototype._updateTaskCount=function(e,t){var n=this._taskCounts,r=n[e],o=n[e]=r+t;if(o<0)throw new Error("More tasks executed then were scheduled.");if(0==r||0==o){var a={microTask:n.microTask>0,macroTask:n.macroTask>0,eventTask:n.eventTask>0,change:e};try{this.hasTask(this.zone,a)}finally{this._parentDelegate&&this._parentDelegate._updateTaskCount(e,t)}}},e}(),g=function(){function e(e,t,n,r,o,i,s){this.runCount=0,this.type=e,this.zone=t,this.source=n,this.data=o,this.scheduleFn=i,this.cancelFn=s,this.callback=r;var u=this;this.invoke=function(){E++;try{return t.runTask(u,this,arguments)}finally{1==E&&a(),E--}}}return e.prototype.toString=function(){return this.data&&"undefined"!=typeof this.data.handleId?this.data.handleId:Object.prototype.toString.call(this)},e}(),y=t("setTimeout"),k=t("Promise"),b=t("then"),m=new d(null,null),T=null,w=[],_=!1,D=[],E=0,S=t("state"),O=t("value"),P="Promise.then",Z=null,j=!0,z=!1,I=0,C=function(){function e(t){var n=this;if(!(n instanceof e))throw new Error("Must be an instanceof Promise.");n[S]=Z,n[O]=[];try{t&&t(c(n,j),c(n,z))}catch(r){l(n,!1,r)}}return e.resolve=function(e){return l(new this(null),j,e)},e.reject=function(e){return l(new this(null),z,e)},e.race=function(e){function t(e){a&&(a=r(e))}function n(e){a&&(a=o(e))}for(var r,o,a=new this(function(e,t){n=[e,t],r=n[0],o=n[1];var n}),s=0,u=e;s<u.length;s++){var c=u[s];i(c)||(c=this.resolve(c)),c.then(t,n)}return a},e.all=function(e){for(var t,n,r=new this(function(e,r){t=e,n=r}),o=0,a=[],s=0,u=e;s<u.length;s++){var c=u[s];i(c)||(c=this.resolve(c)),c.then(function(e){return function(n){a[e]=n,o--,o||t(a)}}(o),n),o++}return o||t(a),r},e.prototype.then=function(e,t){var n=new this.constructor(null),r=d.current;return this[S]==Z?this[O].push(r,n,e,t):p(this,r,n,e,t),n},e.prototype["catch"]=function(e){return this.then(null,e)},e}();C.resolve=C.resolve,C.reject=C.reject,C.race=C.race,C.all=C.all;var M=e[t("Promise")]=e.Promise;if(e.Promise=C,M&&(h(M),"undefined"!=typeof e.fetch)){var L=void 0;try{L=e.fetch()}catch(F){L=e.fetch("about:blank")}L.then(function(){return null},function(){return null}),L.constructor!=M&&L.constructor!=C&&h(L.constructor)}return Promise[d.__symbol__("uncaughtPromiseErrors")]=D,e.Zone=d}("object"==typeof window&&window||"object"==typeof self&&self||global),Zone.__symbol__),S="object"==typeof window&&window||"object"==typeof self&&self||global,O="undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope,P="undefined"!=typeof process&&"[object process]"==={}.toString.call(process),Z=!P&&!O&&!("undefined"==typeof window||!window.HTMLElement),j=E("eventTasks"),z="addEventListener",I="removeEventListener",C=i(z,I),M=s(I),L=E("originalInstance"),F=Object[E("defineProperty")]=Object.defineProperty,H=Object[E("getOwnPropertyDescriptor")]=Object.getOwnPropertyDescriptor,R=Object.create,q=E("unconfigurables"),B="Anchor,Area,Audio,BR,Base,BaseFont,Body,Button,Canvas,Content,DList,Directory,Div,Embed,FieldSet,Font,Form,Frame,FrameSet,HR,Head,Heading,Html,IFrame,Image,Input,Keygen,LI,Label,Legend,Link,Map,Marquee,Media,Menu,Meta,Meter,Mod,OList,Object,OptGroup,Option,Output,Paragraph,Pre,Progress,Quote,Script,Select,Source,Span,Style,TableCaption,TableCell,TableCol,Table,TableRow,TableSection,TextArea,Title,Track,UList,Unknown,Video",x="ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex".split(","),W="EventTarget",X="copy cut paste abort blur focus canplay canplaythrough change click contextmenu dblclick drag dragend dragenter dragleave dragover dragstart drop durationchange emptied ended input invalid keydown keypress keyup load loadeddata loadedmetadata loadstart message mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup pause play playing progress ratechange reset scroll seeked seeking select show stalled submit suspend timeupdate volumechange waiting mozfullscreenchange mozfullscreenerror mozpointerlockchange mozpointerlockerror error webglcontextrestored webglcontextlost webglcontextcreationerror".split(" "),A=E("unbound"),N="set",G="clear",U=["alert","prompt","confirm"],K="object"==typeof window&&window||"object"==typeof self&&self||global;p(K,N,G,"Timeout"),p(K,N,G,"Interval"),p(K,N,G,"Immediate"),p(K,"request","cancel","AnimationFrame"),p(K,"mozRequest","mozCancel","AnimationFrame"),p(K,"webkitRequest","webkitCancel","AnimationFrame");for(var V=0;V<U.length;V++){var J=U[V];f(K,J,function(e,t,n){return function(t,r){return Zone.current.run(e,K,r,n)}})}k(K),m(K),c("MutationObserver"),c("WebKitMutationObserver"),c("FileReader"),h(),_(K),D(K);var Q=E("xhrTask"),Y=E("xhrSync");K.navigator&&K.navigator.geolocation&&t(K.navigator.geolocation,["getCurrentPosition","watchPosition"])});
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t():"function"==typeof define&&define.amd?define(t):t()}(this,function(){"use strict";function e(e,t){for(var n=e.length-1;n>=0;n--)"function"==typeof e[n]&&(e[n]=Zone.current.wrap(e[n],t+"_"+n));return e}function t(t,n){for(var r=t.constructor.name,o=function(o){var a=n[o],i=t[a];i&&(t[a]=function(t){return function(){return t.apply(this,e(arguments,r+"."+a))}}(i))},a=0;a<n.length;a++)o(a)}function n(e,t){var n=Object.getOwnPropertyDescriptor(e,t)||{enumerable:!0,configurable:!0};delete n.writable,delete n.value;var r=t.substr(2),o="_"+t;n.set=function(e){if(this[o]&&this.removeEventListener(r,this[o]),"function"==typeof e){var t=function(t){var n;n=e.apply(this,arguments),void 0==n||n||t.preventDefault()};this[o]=t,this.addEventListener(r,t,!1)}else this[o]=null},n.get=function(){return this[o]||null},Object.defineProperty(e,t,n)}function r(e,t){var r=[];for(var o in e)"on"==o.substr(0,2)&&r.push(o);for(var a=0;a<r.length;a++)n(e,r[a]);if(t)for(var i=0;i<t.length;i++)n(e,"on"+t[i])}function o(e,t,n,r,o){var a=e[P];if(a)for(var i=0;i<a.length;i++){var u=a[i],c=u.data,l=c.handler;if((c.handler===t||l.listener===t)&&c.useCapturing===r&&c.eventName===n)return o&&a.splice(i,1),u}return null}function a(e,t,n){var r=e[P];r||(r=e[P]=[]),n?r.unshift(t):r.push(t)}function i(e,t,n,r,i){function u(e){var t=e.data;return a(t.target,e,i),t.target[l](t.eventName,e.invoke,t.useCapturing)}function c(e){var t=e.data;o(t.target,e.invoke,t.eventName,t.useCapturing,!0),t.target[p](t.eventName,e.invoke,t.useCapturing)}void 0===n&&(n=!0),void 0===r&&(r=!1),void 0===i&&(i=!1);var l=T(e),p=T(t),s=!n&&void 0;return function(t,n){var a=n[0],i=n[1],p=n[2]||s,f=t||L,d=null;"function"==typeof i?d=i:i&&i.handleEvent&&(d=function(e){return i.handleEvent(e)});var v=!1;try{v=i&&"[object FunctionWrapper]"===i.toString()}catch(g){return}if(!d||v)return f[l](a,i,p);if(!r){var y=o(f,i,a,p,!1);if(y)return f[l](a,y.invoke,p)}var b=Zone.current,h=f.constructor.name+"."+e+":"+a,m={target:f,eventName:a,name:a,useCapturing:p,handler:i};b.scheduleEventTask(h,d,m,u,c)}}function u(e,t){void 0===t&&(t=!0);var n=T(e),r=!t&&void 0;return function(e,t){var a=t[0],i=t[1],u=t[2]||r,c=e||L,l=o(c,i,a,u,!0);l?l.zone.cancelTask(l):c[n](a,i,u)}}function c(e){return!(!e||!e.addEventListener)&&(s(e,C,function(){return R}),s(e,S,function(){return q}),!0)}function l(t){var n=L[t];if(n){L[t]=function(){var r=e(arguments,t);switch(r.length){case 0:this[B]=new n;break;case 1:this[B]=new n(r[0]);break;case 2:this[B]=new n(r[0],r[1]);break;case 3:this[B]=new n(r[0],r[1],r[2]);break;case 4:this[B]=new n(r[0],r[1],r[2],r[3]);break;default:throw new Error("Arg list too long.")}};var r,o=new n(function(){});for(r in o)"XMLHttpRequest"===t&&"responseBlob"===r||!function(e){"function"==typeof o[e]?L[t].prototype[e]=function(){return this[B][e].apply(this[B],arguments)}:Object.defineProperty(L[t].prototype,e,{set:function(n){"function"==typeof n?this[B][e]=Zone.current.wrap(n,t+"."+e):this[B][e]=n},get:function(){return this[B][e]}})}(r);for(r in n)"prototype"!==r&&n.hasOwnProperty(r)&&(L[t][r]=n[r])}}function p(e,t){try{return Function("f","return function "+e+"(){return f(this, arguments)}")(t)}catch(n){return function(){return t(this,arguments)}}}function s(e,t,n){for(var r=e;r&&Object.getOwnPropertyNames(r).indexOf(t)===-1;)r=Object.getPrototypeOf(r);!r&&e[t]&&(r=e);var o,a=T(t);return r&&!(o=r[a])&&(o=r[a]=r[t],r[t]=p(t,n(o,a,t))),o}function f(e,t,n,r){function o(t){var n=t.data;return n.args[0]=function(){t.invoke.apply(this,arguments),delete c[n.handleId]},n.handleId=i.apply(e,n.args),c[n.handleId]=t,t}function a(e){return delete c[e.data.handleId],u(e.data.handleId)}var i=null,u=null;t+=r,n+=r;var c={};i=s(e,t,function(n){return function(i,u){if("function"==typeof u[0]){var c=Zone.current,l={handleId:null,isPeriodic:"Interval"===r,delay:"Timeout"===r||"Interval"===r?u[1]||0:null,args:u},p=c.scheduleMacroTask(t,u[0],l,o,a);if(!p)return p;var s=p.data.handleId;return s.ref&&s.unref&&(p.ref=s.ref.bind(s),p.unref=s.unref.bind(s)),p}return n.apply(e,u)}}),u=s(e,n,function(t){return function(n,r){var o="number"==typeof r[0]?c[r[0]]:r[0];o&&"string"==typeof o.type?(o.cancelFn&&o.data.isPeriodic||0===o.runCount)&&o.zone.cancelTask(o):t.apply(e,r)}})}function d(){Object.defineProperty=function(e,t,n){if(g(e,t))throw new TypeError("Cannot assign to read only property '"+t+"' of "+e);var r=n.configurable;return"prototype"!==t&&(n=y(e,t,n)),b(e,t,n,r)},Object.defineProperties=function(e,t){return Object.keys(t).forEach(function(n){Object.defineProperty(e,n,t[n])}),e},Object.create=function(e,t){return"object"!=typeof t||Object.isFrozen(t)||Object.keys(t).forEach(function(n){t[n]=y(e,n,t[n])}),x(e,t)},Object.getOwnPropertyDescriptor=function(e,t){var n=F(e,t);return g(e,t)&&(n.configurable=!1),n}}function v(e,t,n){var r=n.configurable;return n=y(e,t,n),b(e,t,n,r)}function g(e,t){return e&&e[W]&&e[W][t]}function y(e,t,n){return n.configurable=!0,n.configurable||(e[W]||H(e,W,{writable:!0,value:{}}),e[W][t]=!0),n}function b(e,t,n,r){try{return H(e,t,n)}catch(o){if(!n.configurable)throw o;"undefined"==typeof r?delete n.configurable:n.configurable=r;try{return H(e,t,n)}catch(o){var a=null;try{a=JSON.stringify(n)}catch(o){a=a.toString()}console.log("Attempting to configure '"+t+"' with descriptor '"+a+"' on object '"+e+"' and got error, giving up: "+o)}}}function h(e){var t=[],n=e.wtf;n?t=X.split(",").map(function(e){return"HTML"+e+"Element"}).concat(Z):e[z]?t.push(z):t=Z;for(var r=0;r<t.length;r++){var o=e[t[r]];c(o&&o.prototype)}}function m(e){var t=e.WebSocket;e.EventTarget||c(t.prototype),e.WebSocket=function(e,n){var o,a=arguments.length>1?new t(e,n):new t(e),i=Object.getOwnPropertyDescriptor(a,"onmessage");return i&&i.configurable===!1?(o=Object.create(a),["addEventListener","removeEventListener","send","close"].forEach(function(e){o[e]=function(){return a[e].apply(a,arguments)}})):o=a,r(o,["close","error","message","open"]),o};for(var n in t)e.WebSocket[n]=t[n]}function w(e){if(!D){var t="undefined"!=typeof WebSocket;k()?(M&&r(HTMLElement.prototype,A),r(XMLHttpRequest.prototype,null),"undefined"!=typeof IDBIndex&&(r(IDBIndex.prototype,null),r(IDBRequest.prototype,null),r(IDBOpenDBRequest.prototype,null),r(IDBDatabase.prototype,null),r(IDBTransaction.prototype,null),r(IDBCursor.prototype,null)),t&&r(WebSocket.prototype,null)):(O(),l("XMLHttpRequest"),t&&m(e))}}function k(){if(M&&!Object.getOwnPropertyDescriptor(HTMLElement.prototype,"onclick")&&"undefined"!=typeof Element){var e=Object.getOwnPropertyDescriptor(Element.prototype,"onclick");if(e&&!e.configurable)return!1}Object.defineProperty(XMLHttpRequest.prototype,"onreadystatechange",{get:function(){return!0}});var t=new XMLHttpRequest,n=!!t.onreadystatechange;return Object.defineProperty(XMLHttpRequest.prototype,"onreadystatechange",{}),n}function O(){for(var e=function(e){var t=A[e],n="on"+t;self.addEventListener(t,function(e){var t,r,o=e.target;for(r=o?o.constructor.name+"."+n:"unknown."+n;o;)o[n]&&!o[n][N]&&(t=Zone.current.wrap(o[n],r),t[N]=o[n],o[n]=t),o=o.parentElement},!0)},t=0;t<A.length;t++)e(t)}function E(e){if(M&&"registerElement"in e.document){var t=document.registerElement,n=["createdCallback","attachedCallback","detachedCallback","attributeChangedCallback"];document.registerElement=function(e,r){return r&&r.prototype&&n.forEach(function(e){var t="Document.registerElement::"+e;if(r.prototype.hasOwnProperty(e)){var n=Object.getOwnPropertyDescriptor(r.prototype,e);n&&n.value?(n.value=Zone.current.wrap(n.value,t),v(r.prototype,e,n)):r.prototype[e]=Zone.current.wrap(r.prototype[e],t)}else r.prototype[e]&&(r.prototype[e]=Zone.current.wrap(r.prototype[e],t))}),t.apply(document,[e,r])}}}function j(e){function t(e){var t=e[Q];return t}function n(e){var t=e.data;t.target.addEventListener("readystatechange",function(){t.target.readyState===t.target.DONE&&(t.aborted||e.invoke())});var n=t.target[Q];return n||(t.target[Q]=e),i.apply(t.target,t.args),e}function r(){}function o(e){var t=e.data;return t.aborted=!0,u.apply(t.target,t.args)}var a=s(e.XMLHttpRequest.prototype,"open",function(){return function(e,t){return e[Y]=0==t[2],a.apply(e,t)}}),i=s(e.XMLHttpRequest.prototype,"send",function(){return function(e,t){var a=Zone.current;if(e[Y])return i.apply(e,t);var u={target:e,isPeriodic:!1,delay:null,args:t,aborted:!1};return a.scheduleMacroTask("XMLHttpRequest.send",r,u,n,o)}}),u=s(e.XMLHttpRequest.prototype,"abort",function(e){return function(e,n){var r=t(e);if(r&&"string"==typeof r.type){if(null==r.cancelFn)return;r.zone.cancelTask(r)}}})}var T=Zone.__symbol__,L="object"==typeof window&&window||"object"==typeof self&&self||global,I="undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope,D="undefined"!=typeof process&&"[object process]"==={}.toString.call(process),M=!D&&!I&&!("undefined"==typeof window||!window.HTMLElement),P=T("eventTasks"),C="addEventListener",S="removeEventListener",R=i(C,S),q=u(S),B=T("originalInstance"),H=Object[T("defineProperty")]=Object.defineProperty,F=Object[T("getOwnPropertyDescriptor")]=Object.getOwnPropertyDescriptor,x=Object.create,W=T("unconfigurables"),X="Anchor,Area,Audio,BR,Base,BaseFont,Body,Button,Canvas,Content,DList,Directory,Div,Embed,FieldSet,Font,Form,Frame,FrameSet,HR,Head,Heading,Html,IFrame,Image,Input,Keygen,LI,Label,Legend,Link,Map,Marquee,Media,Menu,Meta,Meter,Mod,OList,Object,OptGroup,Option,Output,Paragraph,Pre,Progress,Quote,Script,Select,Source,Span,Style,TableCaption,TableCell,TableCol,Table,TableRow,TableSection,TextArea,Title,Track,UList,Unknown,Video",Z="ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex,WebSocket".split(","),z="EventTarget",A="copy cut paste abort blur focus canplay canplaythrough change click contextmenu dblclick drag dragend dragenter dragleave dragover dragstart drop durationchange emptied ended input invalid keydown keypress keyup load loadeddata loadedmetadata loadstart message mousedown mouseenter mouseleave mousemove mouseout mouseover mouseup pause play playing progress ratechange reset scroll seeked seeking select show stalled submit suspend timeupdate volumechange waiting mozfullscreenchange mozfullscreenerror mozpointerlockchange mozpointerlockerror error webglcontextrestored webglcontextlost webglcontextcreationerror".split(" "),N=T("unbound"),_="set",G="clear",K=["alert","prompt","confirm"],U="object"==typeof window&&window||"object"==typeof self&&self||global;f(U,_,G,"Timeout"),f(U,_,G,"Interval"),f(U,_,G,"Immediate"),f(U,"request","cancel","AnimationFrame"),f(U,"mozRequest","mozCancel","AnimationFrame"),f(U,"webkitRequest","webkitCancel","AnimationFrame");for(var V=0;V<K.length;V++){var J=K[V];s(U,J,function(e,t,n){return function(t,r){return Zone.current.run(e,U,r,n)}})}h(U),w(U),l("MutationObserver"),l("WebKitMutationObserver"),l("FileReader"),d(),E(U),j(U);var Q=T("xhrTask"),Y=T("xhrSync");U.navigator&&U.navigator.geolocation&&t(U.navigator.geolocation,["getCurrentPosition","watchPosition"])});

lib/browser/browser.ts

@@ -9,4 +9,2 @@ /**
 
-import '../zone';
-
 import {patchTimer} from '../common/timers';
@@ -13,0 +11,0 @@ import {patchClass, patchMethod, patchPrototype, zoneSymbol} from '../common/utils';

lib/browser/event-target.ts

@@ -14,3 +14,3 @@ /**
 const NO_EVENT_TARGET =
-    'ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex'
+    'ApplicationCache,EventSource,FileReader,InputMethodContext,MediaController,MessagePort,Node,Performance,SVGElementInstance,SharedWorker,TextTrack,TextTrackCue,TextTrackList,WebKitNamedFlow,Window,Worker,WorkerGlobalScope,XMLHttpRequest,XMLHttpRequestEventTarget,XMLHttpRequestUpload,IDBRequest,IDBOpenDBRequest,IDBDatabase,IDBTransaction,IDBCursor,DBIndex,WebSocket'
         .split(',');
@@ -17,0 +17,0 @@ const EVENT_TARGET = 'EventTarget';

lib/common/utils.ts

@@ -121,7 +121,12 @@ /**
 
+interface NestedEventListener {
+  listener?: EventListenerOrEventListenerObject;
+}
 
+declare type NestedEventListenerOrEventListenerObject = NestedEventListener | EventListener | EventListenerObject;
+
 interface ListenerTaskMeta extends TaskData {
   useCapturing: boolean;
   eventName: string;
-  handler: EventListenerOrEventListenerObject;
+  handler: NestedEventListenerOrEventListenerObject;
   target: any;
@@ -138,3 +143,4 @@ name: string;
       const data = <ListenerTaskMeta>eventTask.data;
-      if (data.handler === handler && data.useCapturing === capture && data.eventName === name) {
+      const listener = <NestedEventListener>data.handler;
+      if ((data.handler === handler || listener.listener === handler) && data.useCapturing === capture && data.eventName === name) {
         if (remove) {
@@ -150,4 +156,22 @@ eventTasks.splice(i, 1);
 
+function findAllExistingRegisteredTasks(target: any, name: string, capture: boolean, remove: boolean): Task[] {
+  const eventTasks: Task[] = target[EVENT_TASKS];
+  if (eventTasks) {
+    const result = [];
+    for (var i = eventTasks.length - 1; i >= 0; i --) {
+      const eventTask = eventTasks[i];
+      const data = <ListenerTaskMeta>eventTask.data;
+      if (data.eventName === name && data.useCapturing === capture) {
+        result.push(eventTask);
+        if (remove) {
+          eventTasks.splice(i, 1);
+        }
+      }
+    }
+    return result;
+  }
+  return null;
+}
 
-function attachRegisteredEvent(target: any, eventTask: Task): void {
+function attachRegisteredEvent(target: any, eventTask: Task, isPrepend: boolean): void {
   let eventTasks: Task[] = target[EVENT_TASKS];
@@ -157,3 +181,7 @@ if (!eventTasks) {
   }
-  eventTasks.push(eventTask);
+  if (isPrepend) {
+    eventTasks.unshift(eventTask);
+  } else {
+    eventTasks.push(eventTask);
+  }
 }
@@ -163,3 +191,3 @@
     addFnName: string, removeFnName: string, useCapturingParam: boolean = true,
-    allowDuplicates: boolean = false) {
+    allowDuplicates: boolean = false, isPrepend: boolean = false) {
   const addFnSymbol = zoneSymbol(addFnName);
@@ -171,3 +199,3 @@ const removeFnSymbol = zoneSymbol(removeFnName);
     const meta = <ListenerTaskMeta>eventTask.data;
-    attachRegisteredEvent(meta.target, eventTask);
+    attachRegisteredEvent(meta.target, eventTask, isPrepend);
     return meta.target[addFnSymbol](meta.eventName, eventTask.invoke, meta.useCapturing);
@@ -256,2 +284,21 @@ }
 
+export function makeZoneAwareRemoveAllListeners(fnName: string, useCapturingParam: boolean = true) {
+  const symbol = zoneSymbol(fnName);
+  const defaultUseCapturing = useCapturingParam ? false : undefined;
+
+  return function zoneAwareRemoveAllListener(self: any, args: any[]) {
+    var eventName = args[0];
+    var useCapturing = args[1] || defaultUseCapturing;
+    var target = self || _global;
+    var eventTasks = findAllExistingRegisteredTasks(target, eventName, useCapturing, true);
+    if (eventTasks) {
+      for (var i = 0; i < eventTasks.length; i ++) {
+        var eventTask = eventTasks[i];
+        eventTask.zone.cancelTask(eventTask);
+      }
+    }
+    target[symbol](eventName, useCapturing);
+  }
+}
+
 export function makeZoneAwareListeners(fnName: string) {
@@ -381,2 +428,2 @@ const symbol = zoneSymbol(fnName);
   return delegate;
-}
+}

lib/node/events.ts

@@ -9,4 +9,10 @@ /**
 
-import {makeZoneAwareAddListener, makeZoneAwareListeners, makeZoneAwareRemoveListener, patchMethod} from '../common/utils';
+import {makeZoneAwareAddListener, makeZoneAwareListeners, makeZoneAwareRemoveListener, makeZoneAwareRemoveAllListeners, patchMethod} from '../common/utils';
 
+const callAndReturnFirstParam = (fn: (self: any, args: any[]) => any) => {
+  return (self: any, args: any[]) => {
+    fn(self, args);
+    return self;
+  };
+};
 
@@ -17,11 +23,10 @@ // For EventEmitter
 const EE_REMOVE_LISTENER = 'removeListener';
+const EE_REMOVE_ALL_LISTENER = 'removeAllListeners';
 const EE_LISTENERS = 'listeners';
 const EE_ON = 'on';
 
-
-const zoneAwareAddListener =
-    makeZoneAwareAddListener(EE_ADD_LISTENER, EE_REMOVE_LISTENER, false, true);
-const zoneAwarePrependListener =
-    makeZoneAwareAddListener(EE_PREPEND_LISTENER, EE_REMOVE_LISTENER, false, true);
-const zoneAwareRemoveListener = makeZoneAwareRemoveListener(EE_REMOVE_LISTENER, false);
+const zoneAwareAddListener = callAndReturnFirstParam(makeZoneAwareAddListener(EE_ADD_LISTENER, EE_REMOVE_LISTENER, false, true, false));
+const zoneAwarePrependListener = callAndReturnFirstParam(makeZoneAwareAddListener(EE_PREPEND_LISTENER, EE_REMOVE_LISTENER, false, true, true));
+const zoneAwareRemoveListener = callAndReturnFirstParam(makeZoneAwareRemoveListener(EE_REMOVE_LISTENER, false));
+const zoneAwareRemoveAllListeners = callAndReturnFirstParam(makeZoneAwareRemoveAllListeners(EE_REMOVE_ALL_LISTENER, false));
 const zoneAwareListeners = makeZoneAwareListeners(EE_LISTENERS);
@@ -34,2 +39,3 @@
     patchMethod(obj, EE_REMOVE_LISTENER, () => zoneAwareRemoveListener);
+    patchMethod(obj, EE_REMOVE_ALL_LISTENER, () => zoneAwareRemoveAllListeners);
     patchMethod(obj, EE_LISTENERS, () => zoneAwareListeners);
@@ -52,2 +58,2 @@ obj[EE_ON] = obj[EE_ADD_LISTENER];
   patchEventEmitterMethods(events.EventEmitter.prototype);
-}
+}

lib/zone.ts

@@ -522,2 +522,17 @@ /**
 
+/**
+ * Extend the Error with additional fields for rewritten stack frames
+ */
+interface Error {
+  /**
+   * Stack trace where extra frames have been removed and zone names added.
+   */
+  zoneAwareStack?: string;
+
+  /**
+   * Original stack trace with no modiffications
+   */
+  originalStack?: string;
+}
+
 /** @internal */
@@ -549,3 +564,3 @@ type AmbientZone = Zone;
     static get current(): AmbientZone {
-      return _currentZone;
+      return _currentZoneFrame.zone;
     };
@@ -611,8 +626,7 @@ static get currentTask(): Task {
         callback: Function, applyThis: any = null, applyArgs: any[] = null, source: string = null) {
-      const oldZone = _currentZone;
-      _currentZone = this;
+      _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
       try {
         return this._zoneDelegate.invoke(this, callback, applyThis, applyArgs, source);
       } finally {
-        _currentZone = oldZone;
+        _currentZoneFrame = _currentZoneFrame.parent;
       }
@@ -623,4 +637,3 @@ }
         callback: Function, applyThis: any = null, applyArgs: any[] = null, source: string = null) {
-      const oldZone = _currentZone;
-      _currentZone = this;
+      _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
       try {
@@ -635,3 +648,3 @@ try {
       } finally {
-        _currentZone = oldZone;
+        _currentZoneFrame = _currentZoneFrame.parent;
       }
@@ -649,4 +662,3 @@ }
       _currentTask = task;
-      const oldZone = _currentZone;
-      _currentZone = this;
+      _currentZoneFrame = new ZoneFrame(_currentZoneFrame, this);
       try {
@@ -664,3 +676,3 @@ if (task.type == 'macroTask' && task.data && !task.data.isPeriodic) {
       } finally {
-        _currentZone = oldZone;
+        _currentZoneFrame = _currentZoneFrame.parent;
         _currentTask = previousTask;
@@ -934,2 +946,11 @@ }
 
+  class ZoneFrame {
+    public parent: ZoneFrame;
+    public zone: Zone;
+    constructor(parent: ZoneFrame, zone: Zone) {
+      this.parent = parent;
+      this.zone = zone;
+    }
+  }
+
   function __symbol__(name: string) {
@@ -942,3 +963,3 @@ return '__zone_symbol__' + name;
 
-  let _currentZone: Zone = new Zone(null, null);
+  let _currentZoneFrame = new ZoneFrame(null, new Zone(null, null));
   let _currentTask: Task = null;
@@ -953,3 +974,3 @@ let _microTaskQueue: Task[] = [];
     // we must bootstrap the initial task creation by manually scheduling the drain
-    if (_numberOfNestedTaskFrames == 0 && _microTaskQueue.length == 0) {
+    if (_numberOfNestedTaskFrames === 0 && _microTaskQueue.length === 0) {
       // We are not running in Task, so we need to kickstart the microtask queue.
@@ -1043,3 +1064,6 @@ if (global[symbolPromise]) {
     if (promise[symbolState] === UNRESOLVED) {
-      if (value instanceof ZoneAwarePromise && value[symbolState] !== UNRESOLVED) {
+      if (value instanceof ZoneAwarePromise &&
+          value.hasOwnProperty(symbolState) &&
+          value.hasOwnProperty(symbolValue) &&
+          value[symbolState] !== UNRESOLVED) {
         clearRejectedNoCatch(<Promise<any>>value);
@@ -1243,3 +1267,151 @@ resolvePromise(promise, value[symbolState], value[symbolValue]);
   Promise[Zone.__symbol__('uncaughtPromiseErrors')] = _uncaughtPromiseErrors;
+
+  /*
+   * This code patches Error so that:
+   *   - It ignores un-needed stack frames.
+   *   - It Shows the associated Zone for reach frame.
+   */
+
+  enum FrameType {
+    /// Skip this frame when printing out stack
+    blackList,
+    /// This frame marks zone transition
+    trasition
+  };
+  const NativeError = global[__symbol__('Error')] = global.Error;
+  // Store the frames which should be removed from the stack frames
+  const blackListedStackFrames: {[frame: string]:FrameType} = {};
+  // We must find the frame where Error was created, otherwise we assume we don't understand stack
+  let zoneAwareFrame: string;
+  global.Error = ZoneAwareError;
+  // How should the stack frames be parsed.
+  let frameParserStrategy = null;
+  const stackRewrite = 'stackRewrite';
+
+
+  /**
+   * This is ZoneAwareError which processes the stack frame and cleans up extra frames as well as
+   * adds zone information to it.
+   */
+  function ZoneAwareError() {
+    // Create an Error.
+    let error: Error = NativeError.apply(this, arguments);
+
+    // Save original stack trace
+    error.originalStack = error.stack;
+
+    // Process the stack trace and rewrite the frames.
+    if (ZoneAwareError[stackRewrite] && error.originalStack) {
+      let frames: string[] = error.originalStack.split('\n');
+      let zoneFrame = _currentZoneFrame;
+      let i = 0;
+      // Find the first frame
+      while (frames[i] !== zoneAwareFrame && i < frames.length) {
+        i++;
+      }
+      for(;i < frames.length && zoneFrame; i++) {
+        let frame = frames[i];
+        if (frame.trim()) {
+          let frameType = blackListedStackFrames.hasOwnProperty(frame) && blackListedStackFrames[frame];
+          if (frameType === FrameType.blackList) {
+            frames.splice(i, 1);
+            i--;
+          } else if (frameType === FrameType.trasition) {
+            if (zoneFrame.parent) {
+              // This is the special frame where zone changed. Print and process it accordingly
+              frames[i] += ` [${zoneFrame.parent.zone.name} => ${zoneFrame.zone.name}]`;
+              zoneFrame = zoneFrame.parent;
+            } else {
+              zoneFrame = null;
+            }
+          } else {
+            frames[i] += ` [${zoneFrame.zone.name}]`;
+          }
+        }
+      }
+      error.stack = error.zoneAwareStack = frames.join('\n');
+    }
+    return error;
+  };
+  // Copy the prototype so that instanceof operator works as expected
+  ZoneAwareError.prototype = NativeError.prototype;
+  ZoneAwareError[Zone.__symbol__('blacklistedStackFrames')] = blackListedStackFrames;
+  ZoneAwareError[stackRewrite] = false;
+
+  if (NativeError.hasOwnProperty('stackTraceLimit')) {
+    // Extend default stack limit as we will be removing few frames.
+    NativeError.stackTraceLimit = Math.max(NativeError.stackTraceLimit, 15);
+
+    // make sure that ZoneAwareError has the same property which forwards to NativeError.
+    Object.defineProperty(ZoneAwareError, 'stackTraceLimit', {
+      get: function() { return NativeError.stackTraceLimit; },
+      set: function(value) { return NativeError.stackTraceLimit = value; }
+    });
+  }
+
+  // Now we need to populet the `blacklistedStackFrames` as well as find the
+  // run/runGuraded/runTask frames. This is done by creating a detect zone and then threading
+  // the execution through all of the above methods so that we can look at the stack trace and
+  // find the frames of interest.
+  let detectZone: Zone = Zone.current.fork({
+    name: 'detect',
+    onInvoke: function(parentZoneDelegate: ZoneDelegate, currentZone: Zone, targetZone: Zone,
+                        delegate: Function, applyThis: any, applyArgs: any[], source: string): any {
+      // Here only so that it will show up in the stack frame so that it can be black listed.
+      return parentZoneDelegate.invoke(targetZone, delegate, applyThis, applyArgs, source);
+    },
+    onHandleError: function(parentZD: ZoneDelegate, current: Zone, target: Zone, error: any): boolean {
+      if (error.originalStack && Error === ZoneAwareError) {
+        let frames = error.originalStack.split(/\n/);
+        let runFrame = false, runGuardedFrame = false, runTaskFrame = false;
+        while (frames.length) {
+          let frame = frames.shift();
+          // On safari it is possible to have stack frame with no line number.
+          // This check makes sure that we don't filter frames on name only (must have linenumber)
+          if (/:\d+:\d+/.test(frame)) {
+            // Get rid of the path so that we don't accidintely find function name in path.
+            // In chrome the seperator is `(` and `@` in FF and safari
+            // Chrome: at Zone.run (zone.js:100)
+            // Chrome: at Zone.run (http://localhost:9876/base/build/lib/zone.js:100:24)
+            // FireFox: Zone.prototype.run@http://localhost:9876/base/build/lib/zone.js:101:24
+            // Safari: run@http://localhost:9876/base/build/lib/zone.js:101:24
+            let fnName: string = frame.split('(')[0].split('@')[0];
+            let frameType = FrameType.trasition;
+            if (fnName.indexOf('ZoneAwareError') !== -1) {
+              zoneAwareFrame = frame;
+            }
+            if (fnName.indexOf('runGuarded') !== -1) {
+              runGuardedFrame = true;
+            } else if (fnName.indexOf('runTask') !== -1) {
+              runTaskFrame = true;
+            } else if (fnName.indexOf('run') !== -1) {
+              runFrame = true;
+            } else {
+              frameType = FrameType.blackList;
+            }
+            blackListedStackFrames[frame] = frameType;
+            // Once we find all of the frames we can stop looking.
+            if (runFrame && runGuardedFrame && runTaskFrame) {
+              ZoneAwareError[stackRewrite] = true;
+              break;
+            }
+          }
+        }
+      }
+      return false;
+    }
+  }) as Zone;
+  // carefully constructor a stack frame which contains all of the frames of interest which
+  // need to be detected and blacklisted.
+  let detectRunFn = () => {
+    detectZone.run(() => {
+      detectZone.runGuarded(() => {
+        throw new Error('blacklistStackFrames');
+      });
+    });
+  };
+  // Cause the error to extract the stack frames.
+  detectZone.runTask(detectZone.scheduleMacroTask('detect', detectRunFn, null, () => null, null));
+
   return global.Zone = Zone;
 })(typeof window === 'object' && window || typeof self === 'object' && self || global);

package.json

 {
   "name": "zone.js",
-  "version": "0.6.26",
+  "version": "0.7.0",
   "description": "Zones for JavaScript",
@@ -21,4 +21,5 @@ "main": "dist/zone-node.js",
     "tsc:w": "tsc -w",
-    "test": "npm run tsc && concurrently \"npm run tsc:w\" \"npm run ws-server\" \"karma start karma.conf.js\"",
+    "test": "npm run tsc && concurrently \"npm run tsc:w\" \"npm run ws-server\" \"karma start karma-jasmine.conf.js\"",
     "test-node": "gulp test/node",
+    "test-mocha": "npm run tsc && concurrently \"npm run tsc:w\" \"npm run ws-server\" \"karma start karma-mocha.conf.js\"",
     "serve": "python -m SimpleHTTPServer 8000"
@@ -56,5 +57,7 @@ },
     "karma-jasmine": "^0.3.6",
+    "karma-mocha": "^1.2.0",
     "karma-safari-launcher": "^0.1.1",
     "karma-sauce-launcher": "^0.2.10",
     "karma-sourcemap-loader": "^0.3.6",
+    "mocha": "^3.1.2",
     "nodejs-websocket": "^1.2.0",
@@ -66,4 +69,4 @@ "pump": "^1.0.1",
     "typescript": "^2.0.2",
-    "whatwg-fetch": "^1.0.0"
+    "whatwg-fetch": "https://github.com/jimmywarting/fetch.git"
   }
 }

README.md

 # Zone.js
 
 [![Build Status](https://travis-ci.org/angular/zone.js.png)](https://travis-ci.org/angular/zone.js)
+[![CDNJS](https://img.shields.io/cdnjs/v/zone.js.svg)](https://cdnjs.com/libraries/zone.js)
 
@@ -8,3 +9,4 @@ Implements _Zones_ for JavaScript, inspired by [Dart](https://www.dartlang.org/articles/zones/).
 > If you're using zone.js via unpkg please provide a query param `?main=browser`  
-`https://unpkg.com/zone.js?main=browser`
+`https://unpkg.com/zone.js?main=browser`  
+> If you're using `newrelic` make sure you import `newrelic` first as it patches global.Promise before zone,js does
 
@@ -15,3 +17,3 @@ # NEW Zone.js POST-v0.6.0
 
-# DEPRECATED Zone.js PRE-v0.5.15
+Read up on [Zone Primer](https://docs.google.com/document/d/1F5Ug0jcrm031vhSMJEOgp1l-Is-Vf0UCNDY-LsQtAIY).
 
@@ -27,283 +29,2 @@ ## What's a Zone?
 
-### Running Within a Zone
-
-You can run code within a zone with `zone.run`.
-Tasks scheduled (with `setTimeout`, `setInterval`, or event listeners) stay within that zone.
-
-```javascript
-Zone.current.fork({}).run(function () {
-    Zone.current.inTheZone = true;
-
-    setTimeout(function () {
-        console.log('in the zone: ' + !!Zone.current.inTheZone);
-    }, 0);
-});
-
-console.log('in the zone: ' + !!Zone.current.inTheZone);
-```
-
-The above will log:
-
-```
-'in the zone: false'
-'in the zone: true'
-```
-
-Note that the function delayed by `setTimeout` stays inside the zone.
-
-### Forking a Zone
-
-Zones have a set of hooks that allow you to change the behavior of code running within that zone.
-To change a zone, you _fork_ it to get a new one.
-
-```javascript
-zone.fork({
-  beforeTask: function () {
-    console.log('hi');
-  }
-}).run(function () {
-  // do stuff
-});
-```
-
-Hooks that you don't override when forking a zone are inherited from the existing one.
-
-See the [API docs](#api) below for more.
-
-
-## Usage
-
-To start using Zones, you need to include the `zone.js` script in this package onto
-your page. This script should appear in the `<head>` of your HTML file before any other
-scripts, including shims/polyfills.
-
-
-## Examples
-
-There are two kinds of examples:
-
-  1. The kind you have to run
-  2. Illustrative code snippets in this README
-
-### Running the ones that you have to run
-
-For fully working examples:
-
-  1. Spawn a webserver in the root of the directory in which this repo lives.
-  (I like to use `python -m SimpleHTTPServer 3000`).
-  2. Open `http://localhost:3000/example` in your browser
-
-Below are the aforementioned snippets.
-
-### Overriding A Zone's Hook
-
-```javascript
-var someZone = zone.fork({
-  afterTask: function () {
-    console.log('goodbye');
-  }
-});
-
-someZone.fork({
-  afterTask: function () {
-    console.log('cya l8r');
-  }
-}).run(function () {
-  // do stuff
-});
-
-// logs: cya l8r
-```
-
-### Augmenting A Zone's Hook
-
-When you fork a zone, you'll often want to control how the parent zone's
-hook gets called.
-
-Prefixing a hook with `$` means that the hook will be passed the
-parent zone's hook, and the hook will be expected to return the function to
-be invoked rather than be the function itself.
-
-```javascript
-var someZone = zone.fork({
-  afterTask: function () {
-    console.log('goodbye');
-  }
-});
-
-someZone.fork({
-  $afterTask: function (parentOnLeave) {
-    // return the hook
-    return function afterTask() {
-      parentOnLeave();
-      console.log('cya l8r');
-    };
-  }
-}).run(function () {
-  // do stuff
-});
-
-// logs: goodbye
-//       cya l8r
-```
-
-#### `+` and `-` Sugar
-Most of the time, you'll want to run a hook before or after the parent's implementation.
-You can prefix a hook with `-` for running before, and `+` for running after.
-
-The above can be written like this:
-
-```javascript
-var someZone = zone.fork({
-  afterTask: function () {
-    console.log('goodbye');
-  }
-});
-
-someZone.fork({
-  '+afterTask': function () {
-    console.log('cya l8r');
-  }
-}).run(function () {
-  // do stuff
-});
-
-// logs: goodbye
-//       cya l8r
-```
-
-This frees you from writing boilerplate to compose a new hook.
-
-## API
-
-Zone.js exports a single object: `window.zone`.
-
-### `zone.run`
-
-Runs a given function within the zone.
-Explained above.
-
-### `zone.bind`
-
-Transforms a function to run within the given zone.
-
-### `zone.fork`
-
-```javascript
-var myZone = zone.fork({
-  onZoneCreated: function () {},
-  beforeTask: function () {},
-  afterTask: function () {},
-  onError: function () {},
-  enqueueTask: function() {},
-  dequeueTask: function() {},
-  setTimeout: function () {},
-  setInterval: function () {},
-  alert: function () {},
-  prompt: function () {},
-});
-myZone.run(function () {
-  // woo!
-});
-```
-
-Below describes the behavior of each of these hooks.
-
-### `zone.onZoneCreated`
-
-Runs when a zone is forked.
-
-### `zone.beforeTask`
-
-Before a function invoked with `zone.run`, this hook runs.
-If `zone.beforeTask` throws, the function  passed to `run` will not be invoked.
-
-### `zone.afterTask`
-
-After a function in a zone runs, the `afterTask` hook runs.
-This hook will run even if the function passed to `run` throws.
-
-### `zone.onError`
-
-This hook is called when the function passed to `run` or the `beforeTask` hook throws.
-
-### `zone.enqueueTask`
-
-This hook is called when a function is registered with the VM.
-For instance `setTimeout` and `addEventListener`.
-
-### `zone.dequeueTask`
-
-This hook is called when a function is unregistered with the VM.
-For instance `clearTimeout` and `removeEventListener`.
-
-### `zone.setTimeout`, `zone.setInterval`, `zone.alert`, `zone.prompt`
-
-These hooks allow you to change the behavior of `window.setTimeout`, `window.setInterval`, etc.
-While in this zone, calls to `window.setTimeout` will redirect to `zone.setTimeout`.
-
-### `zone.requestAnimationFrame`, `zone.webkitRequestAnimationFrame`, `zone.mozRequestAnimationFrame`
-
-These hooks allow you to change the behavior of `window.requestAnimationFrame()`, 
-`window.webkitRequestAnimationFrame`, and `window.mozRequestAnimationFrame`.
-
-By default the wrapCallback is executed in the zone where those methods have been called to avoid 
-growing the stack size on each recursive call.
-
-### `zone.addEventListener`
-
-This hook allows you to intercept calls to `EventTarget#addEventListener`.
-
-````javascript
-var clickListenerCount = 0;
-
-zone.fork(
-  $addEventListener: function(parentAddEventListener) {
-    return function (type, listener) {
-      if (type === 'click') clickListenerCount++;
-      return parentAddEventListener.apply(this, arguments);
-    };
-  }
-);
-
-zone.run(function() {
-  myElement.addEventListener('click', listener);
-  myOtherElement.addEventListener('click', listener);
-
-  console.log(clickListenerCount); // 2
-});
-````
-
-### `zone.removeEventListener`
-
-This hook allows you to intercept calls to `EventTarget#removeEventListener`.
-
-````javascript
-var clickListenerCount = 0;
-
-zone.fork(
-  $removeEventListener: function(parentRemoveEventListener) {
-    return function (type, listener) {
-      if (type === 'click') clickListenerCount--;
-      return parentRemoveEventListener.apply(this, arguments);
-    };
-  }
-);
-
-zone.run(function() {
-  myElement.addEventListener('click', listener);
-  myElement.removeEventListener('click', listener);
-
-  console.log(clickListenerCount); // 0
-});
-````
-
-
-## Status
-
-* `setTimeout`, `setInterval`, and `addEventListener` work in FF23, IE10, and Chrome.
-* stack trace rewrite is kinda ugly and may contain extraneous calls.
-* `elt.onevent` works in FF23, IE10, but not Chrome. There's [a fix in the works though](https://code.google.com/p/chromium/issues/detail?id=43394)!
-
-
 ## See also
@@ -310,0 +31,0 @@ * [async-listener](https://github.com/othiym23/async-listener) - a similar library for node

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of package files

44

increased by7.32%

Lines of code

7036

increased by1.34%

Worsened metrics

Total package byte prevSize

316122

decreased by-2.65%

Dev dependency count

31

increased by6.9%

Number of lines in readme file

36

decreased by-88.57%

No dependency changes