ember-source 1.8.0.beta.3 → 1.8.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd3e19939120975296f3c49573a60ff1077afaa4
-  data.tar.gz: 8a0bb39c6f5d4efd9a3029dcfc7a09577769b44a
+  metadata.gz: 1ffeb5cdfb2eb08e6473fc492c7492620bb6dab8
+  data.tar.gz: 097e80d0bed3b23bc532d963ac4236d2bc68003e
 SHA512:
-  metadata.gz: 8e846f081643523a71dce8176e31685dac4b0489b9949d1faf97447c44cd55e2bb0a88274b72ef1dd1ab29ad689d3029413cd90833bc5fc1bacedbb738bbacec
-  data.tar.gz: 98682ebc8f75b651af4eb556b8cf80856ec137ea4e484de0c0f286aa6aa7840e2e94fb80d8bffc9fda189d14019d5666187c3afba91b479e50638b93321f9217
+  metadata.gz: 633d7ca1d371f1a22efc8647b307c03e682ae4ec52c557e200f5a84b6bfc460f7cbd8a2019e451d6b15abdd1154445d4b5833bc776832caff8f4340552c37c02
+  data.tar.gz: 9c16f7819ee9d7cea4deb894fcc2be592063eff8e6abb1c7d1b63949f079f92fb55ce8ad99c9a1a5e7742a1ec116efc34888bb821f78d677b35493630186cec4

data/VERSION

@@ -1 +1 @@
-1.8.0-beta.3
+1.8.0-beta.4

data/dist/ember-runtime.js

@@ -5,7 +5,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   1.8.0-beta.3
+ * @version   1.8.0-beta.4
  */
 
 (function() {
@@ -82,6 +82,7 @@ define("backburner",
     var isNumber = __dependency1__.isNumber;
     var isCoercableNumber = __dependency1__.isCoercableNumber;
     var wrapInTryCatch = __dependency1__.wrapInTryCatch;
+    var now = __dependency1__.now;
 
     var needsIETryCatchFix = __dependency2__.needsIETryCatchFix;
 
@@ -251,9 +252,11 @@ define("backburner",
       setTimeout: function() {
         var l = arguments.length;
         var args = new Array(l);
+
         for (var x = 0; x < l; x++) {
           args[x] = arguments[x];
         }
+
         var length = args.length,
             method, wait, target,
             methodOrTarget, methodOrWait, methodOrArgs;
@@ -300,7 +303,7 @@ define("backburner",
           }
         }
 
-        var executeAt = (+new Date()) + parseInt(wait, 10);
+        var executeAt = now() + parseInt(wait, 10);
 
         if (isString(method)) {
           method = target[method];
@@ -331,7 +334,7 @@ define("backburner",
       },
 
       throttle: function(target, method /* , args, wait, [immediate] */) {
-        var self = this;
+        var backburner = this;
         var args = arguments;
         var immediate = pop.call(args);
         var wait, throttler, index, timer;
@@ -350,16 +353,16 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findThrottler(target, method, self._throttlers);
+          var index = findThrottler(target, method, backburner._throttlers);
           if (index > -1) {
-            self._throttlers.splice(index, 1);
+            backburner._throttlers.splice(index, 1);
           }
         }, wait);
 
         if (immediate) {
-          self.run.apply(self, args);
+          this.run.apply(this, args);
         }
 
         throttler = [target, method, timer];
@@ -370,7 +373,7 @@ define("backburner",
       },
 
       debounce: function(target, method /* , args, wait, [immediate] */) {
-        var self = this;
+        var backburner = this;
         var args = arguments;
         var immediate = pop.call(args);
         var wait, index, debouncee, timer;
@@ -394,16 +397,16 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findDebouncee(target, method, self._debouncees);
+          var index = findDebouncee(target, method, backburner._debouncees);
           if (index > -1) {
-            self._debouncees.splice(index, 1);
+            backburner._debouncees.splice(index, 1);
           }
         }, wait);
 
         if (immediate && index === -1) {
-          self.run.apply(self, args);
+          backburner.run.apply(backburner, args);
         }
 
         debouncee = [
@@ -412,7 +415,7 @@ define("backburner",
           timer
         ];
 
-        self._debouncees.push(debouncee);
+        backburner._debouncees.push(debouncee);
 
         return debouncee;
       },
@@ -459,7 +462,7 @@ define("backburner",
                   this._laterTimer = null;
                 }
                 if (this._timers.length > 0) { // Update to next available timer when available
-                  updateLaterTimer(this, this._timers[0], this._timers[0] - (+new Date()));
+                  updateLaterTimer(this, this._timers[0], this._timers[0] - now());
                 }
               }
               return true;
@@ -519,48 +522,48 @@ define("backburner",
       });
     }
 
-    function updateLaterTimer(self, executeAt, wait) {
-      var now = (+new Date());
-      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt || self._laterTimerExpiresAt < now) {
+    function updateLaterTimer(backburner, executeAt, wait) {
+      var n = now();
+      if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
 
-        if (self._laterTimer) {
+        if (backburner._laterTimer) {
           // Clear when:
           // - Already expired
           // - New timer is earlier
-          clearTimeout(self._laterTimer);
+          clearTimeout(backburner._laterTimer);
 
-          if (self._laterTimerExpiresAt < now) { // If timer was never triggered
+          if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
             // Calculate the left-over wait-time
-            wait = Math.max(0, executeAt - now);
+            wait = Math.max(0, executeAt - n);
           }
         }
 
-        self._laterTimer = global.setTimeout(function() {
-          self._laterTimer = null;
-          self._laterTimerExpiresAt = null;
-          executeTimers(self);
+        backburner._laterTimer = global.setTimeout(function() {
+          backburner._laterTimer = null;
+          backburner._laterTimerExpiresAt = null;
+          executeTimers(backburner);
         }, wait);
 
-        self._laterTimerExpiresAt = now + wait;
+        backburner._laterTimerExpiresAt = n + wait;
       }
     }
 
-    function executeTimers(self) {
-      var now = +new Date();
+    function executeTimers(backburner) {
+      var n = now();
       var fns, i, l;
 
-      self.run(function() {
-        i = searchTimer(now, self._timers);
+      backburner.run(function() {
+        i = searchTimer(n, backburner._timers);
 
-        fns = self._timers.splice(0, i);
+        fns = backburner._timers.splice(0, i);
 
         for (i = 1, l = fns.length; i < l; i += 2) {
-          self.schedule(self.options.defaultQueue, null, fns[i]);
+          backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
         }
       });
 
-      if (self._timers.length) {
-        updateLaterTimer(self, self._timers[0], self._timers[0] - now);
+      if (backburner._timers.length) {
+        updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
       }
     }
 
@@ -713,7 +716,9 @@ define("backburner/deferred-action-queues",
           var queueIndex = 0;
           var numberOfQueueItems = queueItems.length;
 
-          if (numberOfQueueItems && before) { before(); }
+          if (numberOfQueueItems && before) {
+            before();
+          }
 
           while (queueIndex < numberOfQueueItems) {
             target                = queueItems[queueIndex];
@@ -721,10 +726,26 @@ define("backburner/deferred-action-queues",
             args                  = queueItems[queueIndex+2];
             errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
 
-            if (isString(method)) { method = target[method]; }
+            //
+
+            if (isString(method)) {
+              method = target[method];
+            }
 
             // method could have been nullified / canceled during flush
             if (method) {
+              //
+              //    ** 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.
+              //
               invoke(target, method, args, onError, errorRecordedForStack);
             }
 
@@ -732,7 +753,9 @@ define("backburner/deferred-action-queues",
           }
 
           queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) { after(); }
+          if (numberOfQueueItems && after) {
+            after();
+          }
 
           if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
             queueNameIndex = priorQueueNameIndex;
@@ -927,12 +950,28 @@ define("backburner/queue",
 
       cancel: function(actionToCancel) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
+        var target = actionToCancel.target;
+        var method = actionToCancel.method;
+        var GUID_KEY = this.globalOptions.GUID_KEY;
+
+        if (GUID_KEY && this.targetQueues && target) {
+          var targetQueue = this.targetQueues[target[GUID_KEY]];
+
+          if (targetQueue) {
+            for (i = 0, l = targetQueue.length; i < l; i++) {
+              if (targetQueue[i] === method) {
+                targetQueue.splice(i, 1);
+              }
+            }
+          }
+        }
 
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             queue.splice(i, 4);
             return true;
           }
@@ -948,7 +987,8 @@ define("backburner/queue",
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             // don't mess with array during flush
             // just nullify the method
             queue[i+1] = null;
@@ -972,7 +1012,11 @@ define("backburner/utils",
       }
     }
 
-    __exports__.each = each;function isString(suspect) {
+    __exports__.each = each;// Date.now is not available in browsers < IE9
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+    var now = Date.now || function() { return new Date().getTime(); };
+    __exports__.now = now;
+    function isString(suspect) {
       return typeof suspect === 'string';
     }
 
@@ -2473,7 +2517,7 @@ define("ember-metal/binding",
     var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
-    var Map = __dependency5__.Map;
+    var Map = __dependency5__["default"];
     var addObserver = __dependency6__.addObserver;
     var removeObserver = __dependency6__.removeObserver;
     var _suspendObserver = __dependency6__._suspendObserver;
@@ -2525,7 +2569,7 @@ define("ember-metal/binding",
       this._direction = 'fwd';
       this._from = fromPath;
       this._to   = toPath;
-      this._directionMap = Map.create();
+      this._directionMap = new Map();
       this._readyToSync = undefined;
       this._oneWay = undefined;
     }
@@ -2711,7 +2755,7 @@ define("ember-metal/binding",
         var fromPath = this._from;
         var toPath = this._to;
 
-        directionMap.remove(obj);
+        directionMap.delete(obj);
 
         // if we're synchronizing from the remote object...
         if (direction === 'fwd') {
@@ -3006,7 +3050,7 @@ define("ember-metal/cache",
           value = this.set(key, this.func(key));
         } else if (value === UNDEFINED) {
           this.hits ++;
-          value = UNDEFINED;
+          value = undefined;
         } else {
           this.hits ++;
           // nothing to translate
@@ -4725,7 +4769,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.8.0-beta.3
+      @version 1.8.0-beta.4
     */
 
     if ('undefined' === typeof Ember) {
@@ -4752,10 +4796,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.8.0-beta.3'
+      @default '1.8.0-beta.4'
       @static
     */
-    Ember.VERSION = '1.8.0-beta.3';
+    Ember.VERSION = '1.8.0-beta.4';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -6541,8 +6585,8 @@ define("ember-metal/logger",
     };
   });
 define("ember-metal/map",
-  ["ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/utils","ember-metal/array","ember-metal/platform","ember-metal/deprecate_property","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
@@ -6559,9 +6603,7 @@ define("ember-metal/map",
 
       This implementation follows the current iteration of the ES6 proposal for
       maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
-      with two exceptions. First, because we need our implementation to be pleasant
-      on older browsers, we do not use the `delete` name (using `remove` instead).
-      Second, as we do not have the luxury of in-VM iteration, we implement a
+      with one exception:  as we do not have the luxury of in-VM iteration, we implement a
       forEach method for iteration.
 
       Map is mocked out to look like an Ember object, so you can do
@@ -6571,6 +6613,7 @@ define("ember-metal/map",
     var guidFor = __dependency1__.guidFor;
     var indexOf = __dependency2__.indexOf;
     var create = __dependency3__.create;
+    var deprecateProperty = __dependency4__.deprecateProperty;
 
     function missingFunction(fn) {
       throw new TypeError('' + Object.prototype.toString.call(fn) + " is not a function");
@@ -6616,6 +6659,7 @@ define("ember-metal/map",
 
       if (this instanceof OrderedSet) {
         this.clear();
+        this._silenceRemoveDeprecation = false;
       } else {
         missingNew("OrderedSet");
       }
@@ -6674,7 +6718,9 @@ define("ember-metal/map",
         @return {Boolean}
       */
       remove: function(obj, _guid) {
-        return this['delete'](obj, _guid);
+        Ember.deprecate('Calling `OrderedSet.prototype.remove` has been deprecated, please use `OrderedSet.prototype.delete` instead.', this._silenceRemoveDeprecation);
+
+        return this.delete(obj, _guid);
       },
 
       /**
@@ -6683,7 +6729,7 @@ define("ember-metal/map",
         @param _guid (optional and for internal use only)
         @return {Boolean}
       */
-      'delete': function(obj, _guid) {
+      delete: function(obj, _guid) {
         var guid = _guid || guidFor(obj);
         var presenceSet = this.presenceSet;
         var list = this.list;
@@ -6715,6 +6761,8 @@ define("ember-metal/map",
         @return {Boolean}
       */
       has: function(obj) {
+        if (this.size === 0) { return false; }
+
         var guid = guidFor(obj);
         var presenceSet = this.presenceSet;
 
@@ -6726,14 +6774,20 @@ define("ember-metal/map",
         @param {Function} fn
         @param self
       */
-      forEach: function(fn, thisArg) {
+      forEach: function(fn /*, thisArg*/) {
+        if (typeof fn !== 'function') {
+          missingFunction(fn);
+        }
+
+        if (this.size === 0) { return; }
+
         var list = this.list;
         var length = arguments.length;
         var i;
 
         if (length === 2) {
           for (i = 0; i < list.length; i++) {
-            fn.call(thisArg, list[i]);
+            fn.call(arguments[1], list[i]);
           }
         } else {
           for (i = 0; i < list.length; i++) {
@@ -6758,13 +6812,17 @@ define("ember-metal/map",
         var Constructor = this.constructor;
         var set = new Constructor();
 
+        set._silenceRemoveDeprecation = this._silenceRemoveDeprecation;
         set.presenceSet = copyNull(this.presenceSet);
         set.list = this.toArray();
+        set.size = this.size;
 
         return set;
       }
     };
 
+    deprecateProperty(OrderedSet.prototype, 'length', 'size');
+
     /**
       A Map stores values indexed by keys. Unlike JavaScript's
       default Objects, the keys of a Map can be any JavaScript
@@ -6788,6 +6846,7 @@ define("ember-metal/map",
     function Map() {
       if (this instanceof this.constructor) {
         this.keys = OrderedSet.create();
+        this.keys._silenceRemoveDeprecation = true;
         this.values = Object.create(null);
         this.size = 0;
       } else {
@@ -6826,6 +6885,8 @@ define("ember-metal/map",
         @return {*} the value associated with the key, or `undefined`
       */
       get: function(key) {
+        if (this.size === 0) { return; }
+
         var values = this.values;
         var guid = guidFor(key);
 
@@ -6846,7 +6907,11 @@ define("ember-metal/map",
         var values = this.values;
         var guid = guidFor(key);
 
-        keys.add(key, guid);
+        // ensure we don't store -0
+        var k = key === -0 ? 0 : key;
+
+        keys.add(k, guid);
+
         values[guid] = value;
 
         this.size = keys.size;
@@ -6863,7 +6928,9 @@ define("ember-metal/map",
         @return {Boolean} true if an item was removed, false otherwise
       */
       remove: function(key) {
-        return this['delete'](key);
+        Ember.deprecate('Calling `Map.prototype.remove` has been deprecated, please use `Map.prototype.delete` instead.');
+
+        return this.delete(key);
       },
 
       /**
@@ -6873,7 +6940,8 @@ define("ember-metal/map",
         @param {*} key
         @return {Boolean} true if an item was removed, false otherwise
       */
-      'delete': function(key) {
+      delete: function(key) {
+        if (this.size === 0) { return false; }
         // don't use ES6 "delete" because it will be annoying
         // to use in browsers that are not ES6 friendly;
         var keys = this.keys;
@@ -6881,7 +6949,7 @@ define("ember-metal/map",
         var guid = guidFor(key);
 
         if (values[guid]) {
-          keys.remove(key, guid);
+          keys.delete(key, guid);
           delete values[guid];
           this.size = keys.size;
           return true;
@@ -6898,6 +6966,7 @@ define("ember-metal/map",
         @return {Boolean} true if the item was present, false otherwise
       */
       has: function(key) {
+        if (this.size === 0) { return false; }
         return this.keys.has(key);
       },
 
@@ -6912,16 +6981,19 @@ define("ember-metal/map",
         @param {*} self if passed, the `this` value inside the
           callback. By default, `this` is the map.
       */
-      forEach: function(callback, thisArg) {
+      forEach: function(callback /*, thisArg*/) {
         if (typeof callback !== 'function') {
           missingFunction(callback);
         }
 
+        if (this.size === 0) { return; }
+
         var length = arguments.length;
         var map = this;
-        var cb;
+        var cb, thisArg;
 
         if (length === 2) {
+          thisArg = arguments[1];
           cb = function(key) {
             callback.call(thisArg, map.get(key), key);
           };
@@ -6934,6 +7006,15 @@ define("ember-metal/map",
         this.keys.forEach(cb);
       },
 
+      /**
+        @method clear
+      */
+      clear: function() {
+        this.keys.clear();
+        this.values = Object.create(null);
+        this.size = 0;
+      },
+
       /**
         @method copy
         @return {Ember.Map}
@@ -6943,6 +7024,8 @@ define("ember-metal/map",
       }
     };
 
+    deprecateProperty(Map.prototype, 'length', 'size');
+
     /**
       @class MapWithDefault
       @namespace Ember
@@ -7008,6 +7091,8 @@ define("ember-metal/map",
       }));
     };
 
+    __exports__["default"] = Map;
+
     __exports__.OrderedSet = OrderedSet;
     __exports__.Map = Map;
     __exports__.MapWithDefault = MapWithDefault;
@@ -9421,8 +9506,7 @@ define("ember-metal/run_loop",
         target at the time the method is invoked.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} wait Number of milliseconds to wait.
-      @return {String} a string you can use to cancel the timer in
-        `run.cancel` later.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
     run.later = function(target, method) {
       return apply(backburner, backburner.later, arguments);
@@ -9738,11 +9822,12 @@ define("ember-metal/run_loop",
     };
   });
 define("ember-metal/set_properties",
-  ["ember-metal/property_events","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/property_events","ember-metal/property_set","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var changeProperties = __dependency1__.changeProperties;
     var set = __dependency2__.set;
+    var keys = __dependency3__["default"];
 
     /**
       Set a list of properties on an object. These properties are set inside
@@ -9766,8 +9851,13 @@ define("ember-metal/set_properties",
     */
     __exports__["default"] = function setProperties(self, hash) {
       changeProperties(function() {
-        for(var prop in hash) {
-          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
+        var props = keys(hash);
+        var prop;
+
+        for (var i = 0, l = props.length; i < l; i++) {
+          prop = props[i];
+
+          set(self, prop, hash[prop]);
         }
       });
       return self;
@@ -21577,10 +21667,10 @@ define("rsvp.umd",
     };
 
     /* global define:true module:true window: true */
-    if (typeof define === 'function' && define.amd) {
+    if (typeof define === 'function' && define['amd']) {
       define(function() { return RSVP; });
-    } else if (typeof module !== 'undefined' && module.exports) {
-      module.exports = RSVP;
+    } else if (typeof module !== 'undefined' && module['exports']) {
+      module['exports'] = RSVP;
     } else if (typeof this !== 'undefined') {
       this['RSVP'] = RSVP;
     }
@@ -21596,6 +21686,10 @@ define("rsvp/-internal",
 
     var config = __dependency3__.config;
 
+    function  withOwnPromise() {
+      return new TypeError('A promises callback cannot return that same promise.');
+    }
+
     function noop() {}
 
     var PENDING   = void 0;
@@ -21795,7 +21889,7 @@ define("rsvp/-internal",
         }
 
         if (promise === value) {
-          reject(promise, new TypeError('A promises callback cannot return that same promise.'));
+          reject(promise, withOwnPromise());
           return;
         }
 
@@ -21956,7 +22050,8 @@ define("rsvp/asap",
       }
     }
 
-    var browserGlobal = (typeof window !== 'undefined') ? window : {};
+    var browserWindow = (typeof window !== 'undefined') ? window : undefined
+    var browserGlobal = browserWindow || {};
     var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 
     // test for web worker but not in IE10
@@ -21971,6 +22066,13 @@ define("rsvp/asap",
       };
     }
 
+    // vertx
+    function useVertxTimer() {
+      return function() {
+        vertxNext(flush);
+      };
+    }
+
     function useMutationObserver() {
       var iterations = 0;
       var observer = new BrowserMutationObserver(flush);
@@ -22012,8 +22114,17 @@ define("rsvp/asap",
       len = 0;
     }
 
-    var scheduleFlush;
+    function attemptVertex() {
+      try {
+        var vertx = require('vertx');
+        var vertxNext = vertx.runOnLoop || vertx.runOnContext;
+        return useVertxTimer();
+      } catch(e) {
+        return useSetTimeout();
+      }
+    }
 
+    var scheduleFlush;
     // Decide what async method to use to triggering processing of queued callbacks:
     if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
       scheduleFlush = useNextTick();
@@ -22021,6 +22132,8 @@ define("rsvp/asap",
       scheduleFlush = useMutationObserver();
     } else if (isWorker) {
       scheduleFlush = useMessageChannel();
+    } else if (browserWindow === undefined && typeof require === 'function') {
+      scheduleFlush = attemptVertex();
     } else {
       scheduleFlush = useSetTimeout();
     }
@@ -22098,9 +22211,9 @@ define("rsvp/defer",
     __exports__["default"] = function defer(label) {
       var deferred = { };
 
-      deferred.promise = new Promise(function(resolve, reject) {
-        deferred.resolve = resolve;
-        deferred.reject = reject;
+      deferred['promise'] = new Promise(function(resolve, reject) {
+        deferred['resolve'] = resolve;
+        deferred['reject'] = reject;
       }, label);
 
       return deferred;
@@ -22796,27 +22909,40 @@ define("rsvp/instrument",
 
     var queue = [];
 
+    function scheduleFlush() {
+      setTimeout(function() {
+        var entry;
+        for (var i = 0; i < queue.length; i++) {
+          entry = queue[i];
+
+          var payload = entry.payload;
+
+          payload.guid = payload.key + payload.id;
+          payload.childGuid = payload.key + payload.childId;
+          if (payload.error) {
+            payload.stack = payload.error.stack;
+          }
+
+          config.trigger(entry.name, entry.payload);
+        }
+        queue.length = 0;
+      }, 50);
+    }
+
     __exports__["default"] = function instrument(eventName, promise, child) {
       if (1 === queue.push({
           name: eventName,
           payload: {
-            guid: promise._guidKey + promise._id,
+            key: promise._guidKey,
+            id:  promise._id,
             eventName: eventName,
             detail: promise._result,
-            childGuid: child && promise._guidKey + child._id,
+            childId: child && child._id,
             label: promise._label,
             timeStamp: now(),
-            stack: new Error(promise._label).stack
+            error: config["instrument-with-stack"] ? new Error(promise._label) : null
           }})) {
-
-            setTimeout(function() {
-              var entry;
-              for (var i = 0; i < queue.length; i++) {
-                entry = queue[i];
-                config.trigger(entry.name, entry.payload);
-              }
-              queue.length = 0;
-            }, 50);
+            scheduleFlush();
           }
       }
   });