Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unneeded things that create many mixins and merges. #16772

Merged
merged 1 commit into from
Jun 23, 2018
Merged

Remove unneeded things that create many mixins and merges. #16772

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
21 changes: 1 addition & 20 deletions packages/ember-runtime/lib/system/core_object.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const wasApplied = new WeakSet();
const factoryMap = new WeakMap();

const prototypeMixinMap = new WeakMap();
const classMixinMap = new WeakMap();

/**
@class CoreObject
Expand Down Expand Up @@ -806,7 +805,6 @@ class CoreObject {
@public
*/
static reopenClass() {
reopen.apply(this.ClassMixin, arguments);
applyMixin(this, arguments, false);
return this;
}
Expand Down Expand Up @@ -893,22 +891,10 @@ class CoreObject {
});
}

static get ClassMixin() {
let classMixin = classMixinMap.get(this);
if (classMixin === undefined) {
let s = this.superclass;
classMixin = s === undefined ? Mixin.create() : Mixin.create(s.ClassMixin);
classMixin.ownerConstructor = this;
classMixinMap.set(this, classMixin);
}
return classMixin;
}

static get PrototypeMixin() {
let prototypeMixin = prototypeMixinMap.get(this);
if (prototypeMixin === undefined) {
let s = this.superclass;
prototypeMixin = s === undefined ? Mixin.create() : Mixin.create(s.PrototypeMixin);
prototypeMixin = Mixin.create();
prototypeMixin.ownerConstructor = this;
prototypeMixinMap.set(this, prototypeMixin);
}
Expand All @@ -934,14 +920,9 @@ class CoreObject {
}
}

// CoreObject.prototype.concatenatedProperties = null;
// CoreObject.prototype.mergedProperties = null;

CoreObject.toString = classToString;
setName(CoreObject, 'Ember.CoreObject');

CoreObject.PrototypeMixin.ownerConstructor = CoreObject;

CoreObject.isClass = true;
CoreObject.isMethod = false;

Expand Down