Skip to content
This repository was archived by the owner on Jan 2, 2025. It is now read-only.

2.11.0-beta.3.intercom #1

Open
GavinJoyce wants to merge 1 commit into
base: master
Choose a base branch
from
Open

2.11.0-beta.3.intercom #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember",
"version": "2.11.0-beta.2",
"version": "2.11.0-beta.3.intercom",
"license": "MIT",
"homepage": "https://github.com/emberjs/ember.js",
"main": [
Expand Down
2 changes: 1 addition & 1 deletion component.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ember",
"repo": "components/ember",
"version": "2.11.0-beta.2",
"version": "2.11.0-beta.3.intercom",
"license": "MIT",
"homepage": "https://github.com/emberjs/ember.js",
"main": "ember.debug.js",
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
}
}
},
"version": "2.11.0-beta.2"
"version": "2.11.0-beta.3.intercom"
}
38 changes: 21 additions & 17 deletions ember-runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0-beta.2
* @version 2.11.0-beta.3.intercom
*/

var enifed, requireModule, Ember;
Expand Down Expand Up @@ -2785,6 +2785,8 @@ enifed('ember-metal/alias', ['exports', 'ember-utils', 'ember-metal/debug', 'emb
exports.default = alias;
exports.AliasedProperty = AliasedProperty;

var CONSUMED = {};

function alias(altKey) {
return new AliasedProperty(altKey);
}
Expand All @@ -2805,28 +2807,30 @@ enifed('ember-metal/alias', ['exports', 'ember-utils', 'ember-metal/debug', 'emb
}
};

AliasedProperty.prototype._addDependentKeyIfMissing = function (obj, keyName) {
AliasedProperty.prototype.teardown = function (obj, keyName) {
var meta = _emberMetalMeta.meta(obj);
if (!meta.peekDeps(this.altKey, keyName)) {
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, meta);
if (meta.peekWatching(keyName)) {
_emberMetalDependent_keys.removeDependentKeys(this, obj, keyName, meta);
}
};

AliasedProperty.prototype._removeDependentKeyIfAdded = function (obj, keyName) {
var meta = _emberMetalMeta.meta(obj);
if (meta.peekDeps(this.altKey, keyName)) {
_emberMetalDependent_keys.removeDependentKeys(this, obj, keyName, meta);
}
AliasedProperty.prototype.willWatch = function (obj, keyName) {
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, _emberMetalMeta.meta(obj));
};

AliasedProperty.prototype.willWatch = AliasedProperty.prototype._addDependentKeyIfMissing;
AliasedProperty.prototype.didUnwatch = AliasedProperty.prototype._removeDependentKeyIfAdded;
AliasedProperty.prototype.teardown = AliasedProperty.prototype._removeDependentKeyIfAdded;
AliasedProperty.prototype.didUnwatch = function (obj, keyName) {
_emberMetalDependent_keys.removeDependentKeys(this, obj, keyName, _emberMetalMeta.meta(obj));
};

AliasedProperty.prototype.get = function AliasedProperty_get(obj, keyName) {
this._addDependentKeyIfMissing(obj, keyName);

return _emberMetalProperty_get.get(obj, this.altKey);
var ret = _emberMetalProperty_get.get(obj, this.altKey);
var meta = _emberMetalMeta.meta(obj);
var cache = meta.writableCache();
if (cache[keyName] !== CONSUMED) {
cache[keyName] = CONSUMED;
_emberMetalDependent_keys.addDependentKeys(this, obj, keyName, meta);
}
return ret;
};

AliasedProperty.prototype.set = function AliasedProperty_set(obj, keyName, value) {
Expand Down Expand Up @@ -19396,12 +19400,12 @@ enifed('ember-runtime/utils', ['exports', 'ember-runtime/mixins/array', 'ember-r
enifed("ember/features", ["exports"], function (exports) {
"use strict";

exports.default = { "features-stripped-test": false, "ember-libraries-isregistered": false, "ember-runtime-computed-uniq-by": true, "ember-improved-instrumentation": false, "ember-runtime-enumerable-includes": true, "ember-string-ishtmlsafe": true, "ember-testing-check-waiters": true, "ember-metal-weakmap": false, "ember-glimmer-allow-backtracking-rerender": false, "ember-testing-resume-test": false, "mandatory-setter": true, "ember-glimmer-detect-backtracking-rerender": true };
exports.default = { "features-stripped-test": false, "ember-libraries-isregistered": false, "ember-runtime-computed-uniq-by": true, "ember-improved-instrumentation": false, "ember-runtime-enumerable-includes": true, "ember-string-ishtmlsafe": true, "ember-testing-check-waiters": true, "ember-metal-weakmap": false, "ember-glimmer-allow-backtracking-rerender": true, "ember-testing-resume-test": false, "ember-glimmer-detect-backtracking-rerender": true, "mandatory-setter": true };
});
enifed("ember/version", ["exports"], function (exports) {
"use strict";

exports.default = "2.11.0-beta.2";
exports.default = "2.11.0-beta.3.intercom";
});
enifed('rsvp', ['exports'], function (exports) {
'use strict';
Expand Down
263 changes: 135 additions & 128 deletions ember-template-compiler.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ember-testing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0-beta.2
* @version 2.11.0-beta.3.intercom
*/

var enifed, requireModule, Ember;
Expand Down
Loading