Skip to content

Commit dc39936

Browse files
author
Robert Jackson
committed
Release v2.9.0-beta.4.
1 parent 1721af7 commit dc39936

File tree

12 files changed

+3607
-2941
lines changed

12 files changed

+3607
-2941
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember",
3-
"version": "2.9.0-beta.3",
3+
"version": "2.9.0-beta.4",
44
"license": "MIT",
55
"homepage": "https://github.com/emberjs/ember.js",
66
"main": [

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ember",
33
"repo": "components/ember",
4-
"version": "2.9.0-beta.3",
4+
"version": "2.9.0-beta.4",
55
"license": "MIT",
66
"homepage": "https://github.com/emberjs/ember.js",
77
"main": "ember.debug.js",

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
}
2626
}
2727
},
28-
"version": "2.9.0-beta.3"
28+
"version": "2.9.0-beta.4"
2929
}

ember-docs.json

Lines changed: 70 additions & 52 deletions
Large diffs are not rendered by default.

ember-runtime.js

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
77
* @license Licensed under MIT license
88
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
9-
* @version 2.9.0-beta.3
9+
* @version 2.9.0-beta.4
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -2800,23 +2800,40 @@ enifed('ember-metal/alias', ['exports', 'ember-utils', 'ember-metal/debug', 'emb
28002800

28012801
AliasedProperty.prototype = Object.create(_emberMetalProperties.Descriptor.prototype);
28022802

2803-
AliasedProperty.prototype.get = function AliasedProperty_get(obj, keyName) {
2804-
return _emberMetalProperty_get.get(obj, this.altKey);
2803+
AliasedProperty.prototype.setup = function (obj, keyName) {
2804+
_emberMetalDebug.assert('Setting alias \'' + keyName + '\' on self', this.altKey !== keyName);
2805+
var meta = _emberMetalMeta.meta(obj);
2806+
if (meta.peekWatching(keyName)) {
2807+
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, meta);
2808+
}
28052809
};
28062810

2807-
AliasedProperty.prototype.set = function AliasedProperty_set(obj, keyName, value) {
2808-
return _emberMetalProperty_set.set(obj, this.altKey, value);
2811+
AliasedProperty.prototype._addDependentKeyIfMissing = function (obj, keyName) {
2812+
var meta = _emberMetalMeta.meta(obj);
2813+
if (!meta.peekDeps(this.altKey, keyName)) {
2814+
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, meta);
2815+
}
28092816
};
28102817

2811-
AliasedProperty.prototype.setup = function (obj, keyName) {
2812-
_emberMetalDebug.assert('Setting alias \'' + keyName + '\' on self', this.altKey !== keyName);
2813-
var m = _emberMetalMeta.meta(obj);
2814-
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, m);
2818+
AliasedProperty.prototype._removeDependentKeyIfAdded = function (obj, keyName) {
2819+
var meta = _emberMetalMeta.meta(obj);
2820+
if (meta.peekDeps(this.altKey, keyName)) {
2821+
_emberMetalDependent_keys.removeDependentKeys(this, obj, keyName, meta);
2822+
}
28152823
};
28162824

2817-
AliasedProperty.prototype.teardown = function (obj, keyName) {
2818-
var m = _emberMetalMeta.meta(obj);
2819-
_emberMetalDependent_keys.removeDependentKeys(this, obj, keyName, m);
2825+
AliasedProperty.prototype.willWatch = AliasedProperty.prototype._addDependentKeyIfMissing;
2826+
AliasedProperty.prototype.didUnwatch = AliasedProperty.prototype._removeDependentKeyIfAdded;
2827+
AliasedProperty.prototype.teardown = AliasedProperty.prototype._removeDependentKeyIfAdded;
2828+
2829+
AliasedProperty.prototype.get = function AliasedProperty_get(obj, keyName) {
2830+
this._addDependentKeyIfMissing(obj, keyName);
2831+
2832+
return _emberMetalProperty_get.get(obj, this.altKey);
2833+
};
2834+
2835+
AliasedProperty.prototype.set = function AliasedProperty_set(obj, keyName, value) {
2836+
return _emberMetalProperty_set.set(obj, this.altKey, value);
28202837
};
28212838

28222839
AliasedProperty.prototype.readOnly = function () {
@@ -8739,11 +8756,6 @@ enifed('ember-metal/property_get', ['exports', 'ember-metal/debug', 'ember-metal
87398756
_emberMetalDebug.assert('The key provided to get must be a string, you passed ' + keyName, typeof keyName === 'string');
87408757
_emberMetalDebug.assert('\'this\' in paths is not supported', !_emberMetalPath_cache.hasThis(keyName));
87418758

8742-
// Helpers that operate with 'this' within an #each
8743-
if (keyName === '') {
8744-
return obj;
8745-
}
8746-
87478759
var value = obj[keyName];
87488760
var desc = value !== null && typeof value === 'object' && value.isDescriptor ? value : undefined;
87498761
var ret = undefined;
@@ -19104,7 +19116,7 @@ enifed("ember/features", ["exports"], function (exports) {
1910419116
enifed("ember/version", ["exports"], function (exports) {
1910519117
"use strict";
1910619118

19107-
exports.default = "2.9.0-beta.3";
19119+
exports.default = "2.9.0-beta.4";
1910819120
});
1910919121
/*!
1911019122
* @overview RSVP - a tiny implementation of Promises/A+.

ember-template-compiler.js

Lines changed: 307 additions & 131 deletions
Large diffs are not rendered by default.

ember-testing.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
77
* @license Licensed under MIT license
88
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
9-
* @version 2.9.0-beta.3
9+
* @version 2.9.0-beta.4
1010
*/
1111

1212
var enifed, requireModule, require, Ember;
@@ -562,7 +562,7 @@ enifed('ember-debug/index', ['exports', 'ember-metal', 'ember-environment', 'emb
562562
_emberMetal.FEATURES['features-stripped-test'] = true;
563563
var featuresWereStripped = true;
564564

565-
if (_emberMetal.isFeatureEnabled('features-stripped-test')) {
565+
if (false) {
566566
featuresWereStripped = false;
567567
}
568568

@@ -1849,7 +1849,7 @@ enifed('ember-testing/test', ['exports', 'ember-testing/test/helpers', 'ember-te
18491849
unregisterWaiter: _emberTestingTestWaiters.unregisterWaiter
18501850
};
18511851

1852-
if (_emberMetal.isFeatureEnabled('ember-testing-check-waiters')) {
1852+
if (true) {
18531853
Test.checkWaiters = _emberTestingTestWaiters.checkWaiters;
18541854
}
18551855

@@ -2360,7 +2360,7 @@ enifed('ember-testing/test/waiters', ['exports', 'ember-metal'], function (expor
23602360
}
23612361

23622362
function generateDeprecatedWaitersArray() {
2363-
_emberMetal.deprecate('Usage of `Ember.Test.waiters` is deprecated. Please refactor to `Ember.Test.checkWaiters`.', !_emberMetal.isFeatureEnabled('ember-testing-check-waiters'), { until: '2.8.0', id: 'ember-testing.test-waiters' });
2363+
_emberMetal.deprecate('Usage of `Ember.Test.waiters` is deprecated. Please refactor to `Ember.Test.checkWaiters`.', !true, { until: '2.8.0', id: 'ember-testing.test-waiters' });
23642364

23652365
var array = new Array(callbacks.length);
23662366
for (var i = 0; i < callbacks.length; i++) {

0 commit comments

Comments
 (0)