ember-source 2.15.0 → 2.15.1

data/dist/ember.prod.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.15.0
+ * @version   2.15.1
  */
 
 var enifed, requireModule, Ember;
@@ -9487,7 +9487,6 @@ enifed('backburner', ['exports'], function (exports) {
             this.name = name;
             this.options = options;
             this.globalOptions = globalOptions;
-            this.globalOptions.onError = getOnError(globalOptions);
         }
 
         Queue.prototype.push = function (target, method, args, stack) {
@@ -9517,14 +9516,13 @@ enifed('backburner', ['exports'], function (exports) {
             var _options = this.options,
                 before = _options.before,
                 after = _options.after,
+                onError,
                 i;
 
             var target = void 0;
             var method = void 0;
             var args = void 0;
             var errorRecordedForStack = void 0;
-            var onError = this.globalOptions.onError;
-            var invoke = onError ? this.invokeWithOnError : this.invoke;
             this.targetQueues = Object.create(null);
             var queueItems = void 0;
             if (this._queueBeingFlushed.length > 0) {
@@ -9536,33 +9534,39 @@ enifed('backburner', ['exports'], function (exports) {
             if (before) {
                 before();
             }
-            for (i = this.index; i < queueItems.length; i += 4) {
-                this.index += 4;
-                target = queueItems[i];
-                method = queueItems[i + 1];
-                args = queueItems[i + 2];
-                errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
-                // method could have been nullified / canceled during flush
-                if (method !== null) {
-                    //
-                    //    ** Attention intrepid developer **
-                    //
-                    //    To find out the stack of this task when it was scheduled onto
-                    //    the run loop, add the following to your app.js:
-                    //
-                    //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
-                    //
-                    //    Once that is in place, when you are at a breakpoint and navigate
-                    //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
-                    //    which will be the captured stack when this job was scheduled.
-                    //
-                    //    One possible long-term solution is the following Chrome issue:
-                    //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
-                    //
-                    invoke(target, method, args, onError, errorRecordedForStack);
-                }
-                if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
-                    return 1 /* Pause */;
+            var invoke = void 0;
+            if (queueItems.length > 0) {
+                onError = getOnError(this.globalOptions);
+
+                invoke = onError ? this.invokeWithOnError : this.invoke;
+                for (i = this.index; i < queueItems.length; i += 4) {
+                    this.index += 4;
+                    target = queueItems[i];
+                    method = queueItems[i + 1];
+                    args = queueItems[i + 2];
+                    errorRecordedForStack = queueItems[i + 3]; // Debugging assistance
+                    // method could have been nullified / canceled during flush
+                    if (method !== null) {
+                        //
+                        //    ** Attention intrepid developer **
+                        //
+                        //    To find out the stack of this task when it was scheduled onto
+                        //    the run loop, add the following to your app.js:
+                        //
+                        //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+                        //
+                        //    Once that is in place, when you are at a breakpoint and navigate
+                        //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+                        //    which will be the captured stack when this job was scheduled.
+                        //
+                        //    One possible long-term solution is the following Chrome issue:
+                        //       https://bugs.chromium.org/p/chromium/issues/detail?id=332624
+                        //
+                        invoke(target, method, args, onError, errorRecordedForStack);
+                    }
+                    if (this.index !== this._queueBeingFlushed.length && this.globalOptions.mustYield && this.globalOptions.mustYield()) {
+                        return 1 /* Pause */;
+                    }
                 }
             }
             if (after) {
@@ -9773,7 +9777,6 @@ enifed('backburner', ['exports'], function (exports) {
 
     // accepts a function that when invoked will return an iterator
     // iterator will drain until completion
-    // accepts a function that when invoked will return an iterator
     var iteratorDrain = function (fn) {
         var iterator = fn();
         var result = iterator.next();
@@ -9783,7 +9786,6 @@ enifed('backburner', ['exports'], function (exports) {
         }
     };
 
-    var now = Date.now;
     var noop = function () {};
 
     var Backburner = function () {
@@ -9824,6 +9826,9 @@ enifed('backburner', ['exports'], function (exports) {
                 return platform.setTimeout(fn, 0);
             };
             platform.clearNext = _platform.clearNext || platform.clearTimeout;
+            platform.now = _platform.now || function () {
+                return Date.now();
+            };
             this._platform = platform;
             this._boundRunExpiredTimers = function () {
                 _this._runExpiredTimers();
@@ -10122,7 +10127,7 @@ enifed('backburner', ['exports'], function (exports) {
                 }
             }
             var onError = getOnError(this.options);
-            var executeAt = now() + wait;
+            var executeAt = this._platform.now() + wait;
             var fn = void 0;
             if (onError) {
                 fn = function () {
@@ -10342,7 +10347,7 @@ enifed('backburner', ['exports'], function (exports) {
             var l = timers.length;
             var i = 0;
             var defaultQueue = this.options.defaultQueue;
-            var n = now();
+            var n = this._platform.now();
             for (; i < l; i += 2) {
                 executeAt = timers[i];
 
@@ -10376,7 +10381,7 @@ enifed('backburner', ['exports'], function (exports) {
                 return;
             }
             var minExpiresAt = this._timers[0];
-            var n = now();
+            var n = this._platform.now();
             var wait = Math.max(0, minExpiresAt - n);
             this._timerTimeoutId = this._platform.setTimeout(this._boundRunExpiredTimers, wait);
         };
@@ -25457,22 +25462,20 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   };
 
   var onerror = void 0;
+  var onErrorTarget = {
+    get onerror() {
+      return dispatchOverride || onerror;
+    }
+  };
+
   // Ember.onerror getter
 
   // Ember.onerror setter
-  function setOnerror(handler) {
-    onerror = handler;
-  }
+
 
   var dispatchOverride = void 0;
   // dispatch error
-  function dispatchError(error) {
-    if (dispatchOverride) {
-      dispatchOverride(error);
-    } else {
-      defaultDispatch(error);
-    }
-  }
+
 
   // allows testing adapter to override dispatch
 
@@ -25766,15 +25769,6 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   */
 
 
-  var onErrorTarget = {
-    get onerror() {
-      return dispatchError;
-    },
-    set onerror(handler) {
-      return setOnerror(handler);
-    }
-  };
-
   var backburner = new Backburner(['sync', 'actions', 'destroy'], {
     GUID_KEY: emberUtils.GUID_KEY,
     sync: {
@@ -28662,8 +28656,16 @@ enifed('ember-metal', ['exports', 'ember-environment', 'ember-utils', 'ember-deb
   exports.getOnerror = function () {
     return onerror;
   };
-  exports.setOnerror = setOnerror;
-  exports.dispatchError = dispatchError;
+  exports.setOnerror = function (handler) {
+    onerror = handler;
+  };
+  exports.dispatchError = function (error) {
+    if (dispatchOverride) {
+      dispatchOverride(error);
+    } else {
+      defaultDispatch(error);
+    }
+  };
   exports.setDispatchOverride = function (handler) {
     dispatchOverride = handler;
   };
@@ -32967,6 +32969,9 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
           errorRouteName = findRouteStateName(route, 'error');
 
           if (errorRouteName) {
+            _errorId = (0, _emberUtils.guidFor)(error);
+
+            router._markErrorAsHandled(_errorId);
             router.intermediateTransitionTo(errorRouteName, error);
             return false;
           }
@@ -32974,8 +32979,13 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
 
         // Check for an 'error' substate route
         var errorSubstateName = findRouteSubstateName(route, 'error'),
-            errorRouteName;
+            errorRouteName,
+            _errorId,
+            errorId;
         if (errorSubstateName) {
+          errorId = (0, _emberUtils.guidFor)(error);
+
+          router._markErrorAsHandled(errorId);
           router.intermediateTransitionTo(errorSubstateName, error);
           return false;
         }
@@ -44321,7 +44331,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'node-module',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.15.0";
+  exports.default = "2.15.1";
 });
 enifed('node-module', ['exports'], function(_exports) {
   var IS_NODE = typeof module === 'object' && typeof module.require === 'function';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-source
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies: []
 description: Ember.js source code wrapper for use with Ruby libs.
 email:
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ember.js source code wrapper.