dist/ember-runtime.js in ember-source-2.8.0.beta.1 vs dist/ember-runtime.js in ember-source-2.8.0.beta.2
- old
+ new
@@ -4,11 +4,11 @@
* @copyright Copyright 2011-2016 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* 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.8.0-beta.1
+ * @version 2.8.0-beta.2
*/
var enifed, requireModule, require, Ember;
var mainContext = this;
@@ -3069,11 +3069,11 @@
_emberMetalObserver.addObserver(obj, this._to, this, 'toDidChange');
}
_emberMetalEvents.addListener(obj, 'willDestroy', this, 'disconnect');
- fireDeprecations(possibleGlobal, this._oneWay, !possibleGlobal && !this._oneWay);
+ fireDeprecations(obj, this._to, this._from, possibleGlobal, this._oneWay, !possibleGlobal && !this._oneWay);
this._readyToSync = true;
this._fromObj = fromObj;
this._fromPath = fromPath;
this._toObj = obj;
@@ -3178,26 +3178,27 @@
}
}
};
- function fireDeprecations(deprecateGlobal, deprecateOneWay, deprecateAlias) {
+ function fireDeprecations(obj, toPath, fromPath, deprecateGlobal, deprecateOneWay, deprecateAlias) {
var deprecateGlobalMessage = '`Ember.Binding` is deprecated. Since you' + ' are binding to a global consider using a service instead.';
var deprecateOneWayMessage = '`Ember.Binding` is deprecated. Since you' + ' are using a `oneWay` binding consider using a `readOnly` computed' + ' property instead.';
var deprecateAliasMessage = '`Ember.Binding` is deprecated. Consider' + ' using an `alias` computed property instead.';
- _emberMetalDebug.deprecate(deprecateGlobalMessage, !deprecateGlobal, {
+ var objectInfo = 'The `' + toPath + '` property of `' + obj + '` is an `Ember.Binding` connected to `' + fromPath + '`, but ';
+ _emberMetalDebug.deprecate(objectInfo + deprecateGlobalMessage, !deprecateGlobal, {
id: 'ember-metal.binding',
until: '3.0.0',
url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
});
- _emberMetalDebug.deprecate(deprecateOneWayMessage, !deprecateOneWay, {
+ _emberMetalDebug.deprecate(objectInfo + deprecateOneWayMessage, !deprecateOneWay, {
id: 'ember-metal.binding',
until: '3.0.0',
url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
});
- _emberMetalDebug.deprecate(deprecateAliasMessage, !deprecateAlias, {
+ _emberMetalDebug.deprecate(objectInfo + deprecateAliasMessage, !deprecateAlias, {
id: 'ember-metal.binding',
until: '3.0.0',
url: 'http://emberjs.com/deprecations/v2.x#toc_ember-binding'
});
}
@@ -3401,29 +3402,16 @@
this.func = func;
this.key = key;
this.store = store || new DefaultStore();
}
- Cache.prototype.set = function set(obj, value) {
- if (this.limit > this.size) {
- var key = this.key === undefined ? obj : this.key(obj);
- this.size++;
- if (value === undefined) {
- this.store.set(key, UNDEFINED);
- } else {
- this.store.set(key, value);
- }
- }
- return value;
- };
-
Cache.prototype.get = function get(obj) {
var key = this.key === undefined ? obj : this.key(obj);
var value = this.store.get(key);
if (value === undefined) {
this.misses++;
- value = this.set(key, this.func(obj));
+ value = this._set(key, this.func(obj));
} else if (value === UNDEFINED) {
this.hits++;
value = undefined;
} else {
this.hits++;
@@ -3431,10 +3419,28 @@
}
return value;
};
+ Cache.prototype.set = function set(obj, value) {
+ var key = this.key === undefined ? obj : this.key(obj);
+ return this._set(key, value);
+ };
+
+ Cache.prototype._set = function _set(key, value) {
+ if (this.limit > this.size) {
+ this.size++;
+ if (value === undefined) {
+ this.store.set(key, UNDEFINED);
+ } else {
+ this.store.set(key, value);
+ }
+ }
+
+ return value;
+ };
+
Cache.prototype.purge = function purge() {
this.store.clear();
this.size = 0;
this.hits = 0;
this.misses = 0;
@@ -19888,10 +19894,10 @@
exports.default = {};
});
enifed("ember/version", ["exports"], function (exports) {
"use strict";
- exports.default = "2.8.0-beta.1";
+ exports.default = "2.8.0-beta.2";
});
enifed('rsvp', ['exports', 'rsvp/promise', 'rsvp/events', 'rsvp/node', 'rsvp/all', 'rsvp/all-settled', 'rsvp/race', 'rsvp/hash', 'rsvp/hash-settled', 'rsvp/rethrow', 'rsvp/defer', 'rsvp/config', 'rsvp/map', 'rsvp/resolve', 'rsvp/reject', 'rsvp/filter', 'rsvp/asap'], function (exports, _rsvpPromise, _rsvpEvents, _rsvpNode, _rsvpAll, _rsvpAllSettled, _rsvpRace, _rsvpHash, _rsvpHashSettled, _rsvpRethrow, _rsvpDefer, _rsvpConfig, _rsvpMap, _rsvpResolve, _rsvpReject, _rsvpFilter, _rsvpAsap) {
'use strict';
// defaults