Skip to content

Commit 251eae8

Browse files
committed
Kill ObservableMixin, EmberObject no longer uses mixins!
1 parent 1fa44dc commit 251eae8

File tree

14 files changed

+447
-1449
lines changed

14 files changed

+447
-1449
lines changed

broccoli/amd-compat-entrypoints/ember.debug.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ d('@ember/object/lib/computed/computed_macros', emberObjectLibComputedComputedMa
227227
import * as emberObjectMixin from '@ember/object/mixin';
228228
d('@ember/object/mixin', emberObjectMixin);
229229

230-
import * as emberObjectObservable from '@ember/object/observable';
231-
d('@ember/object/observable', emberObjectObservable);
232-
233230
import * as emberObjectObservers from '@ember/object/observers';
234231
d('@ember/object/observers', emberObjectObservers);
235232

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@
263263
"@ember/object/lib/computed/computed_macros.js": "ember-source/@ember/object/lib/computed/computed_macros.js",
264264
"@ember/object/lib/computed/reduce_computed_macros.js": "ember-source/@ember/object/lib/computed/reduce_computed_macros.js",
265265
"@ember/object/mixin.js": "ember-source/@ember/object/mixin.js",
266-
"@ember/object/observable.js": "ember-source/@ember/object/observable.js",
267266
"@ember/object/observers.js": "ember-source/@ember/object/observers.js",
268267
"@ember/owner/index.js": "ember-source/@ember/owner/index.js",
269268
"@ember/renderer/index.js": "ember-source/@ember/renderer/index.js",

packages/@ember/-internals/views/lib/system/event_dispatcher.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,13 @@ export default class EventDispatcher extends EmberObject {
350350

351351
destroy() {
352352
if (this._didSetup === false) {
353-
return;
353+
return this;
354354
}
355355

356356
let rootElement = this._sanitizedRootElement;
357357

358358
if (!rootElement) {
359-
return;
359+
return this;
360360
}
361361

362362
for (let event in this._eventHandlers) {
@@ -365,7 +365,7 @@ export default class EventDispatcher extends EmberObject {
365365

366366
rootElement.classList.remove(ROOT_ELEMENT_CLASS);
367367

368-
return this._super(...arguments);
368+
return super.destroy();
369369
}
370370

371371
toString() {

0 commit comments

Comments
 (0)