Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions broccoli/amd-compat-entrypoints/ember.debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ d('@ember/object/computed', emberObjectComputed);
import * as emberObjectCore from '@ember/object/core';
d('@ember/object/core', emberObjectCore);

import * as emberObjectEvents from '@ember/object/events';
d('@ember/object/events', emberObjectEvents);

import * as emberObjectIndex from '@ember/object/index';
d('@ember/object/index', emberObjectIndex);

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@
"@ember/object/compat.js": "ember-source/@ember/object/compat.js",
"@ember/object/computed.js": "ember-source/@ember/object/computed.js",
"@ember/object/core.js": "ember-source/@ember/object/core.js",
"@ember/object/events.js": "ember-source/@ember/object/events.js",
"@ember/object/index.js": "ember-source/@ember/object/index.js",
"@ember/object/internals.js": "ember-source/@ember/object/internals.js",
"@ember/object/lib/computed/computed_macros.js": "ember-source/@ember/object/lib/computed/computed_macros.js",
Expand Down
1 change: 0 additions & 1 deletion packages/@ember/object/events.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/@ember/object/mixin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
defineDecorator,
defineValue,
} from '@ember/-internals/metal';
import { addListener, removeListener } from '@ember/object/events';
import { addListener, removeListener } from '@ember/-internals/metal';

const a_concat = Array.prototype.concat;
const { isArray } = Array;
Expand Down
10 changes: 0 additions & 10 deletions packages/ember/barrel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ import { dependentKeyCompat } from '@ember/object/compat';
import EmberComputedProperty, {
expandProperties as emberExpandProperties,
} from '@ember/object/computed';
import {
addListener as emberAddListener,
removeListener as emberRemoveListener,
sendEvent as emberSendEvent,
} from '@ember/object/events';

import { RSVP as _RSVP } from '@ember/-internals/runtime';
import {
Expand Down Expand Up @@ -293,11 +288,6 @@ namespace Ember {
export const CoreObject = EmberCoreObject;
export type CoreObject = EmberCoreObject;

// ****@ember/object/events****
export const addListener = emberAddListener;
export const removeListener = emberRemoveListener;
export const sendEvent = emberSendEvent;

// ****@ember/object/mixin****
export const Mixin = EmberMixin;
export type Mixin = EmberMixin;
Expand Down
4 changes: 0 additions & 4 deletions packages/ember/tests/reexports_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ import * as test21 from '@ember/object';
import * as test22 from '@ember/object/compat';
import * as test23 from '@ember/object/computed';
import * as test24 from '@ember/object/core';
import * as test26 from '@ember/object/events';
import * as test27 from '@ember/object/internals';
import * as test28 from '@ember/object/mixin';
import * as test30 from '@ember/object/observers';
Expand Down Expand Up @@ -194,9 +193,6 @@ let allExports = [
['ComputedProperty', '@ember/object/computed', 'default', test23],
['expandProperties', '@ember/object/computed', 'expandProperties', test23],
['CoreObject', '@ember/object/core', 'default', test24],
['addListener', '@ember/object/events', 'addListener', test26],
['removeListener', '@ember/object/events', 'removeListener', test26],
['sendEvent', '@ember/object/events', 'sendEvent', test26],
['cacheFor', '@ember/object/internals', 'cacheFor', test27],
['guidFor', '@ember/object/internals', 'guidFor', test27],
['Mixin', '@ember/object/mixin', 'default', test28],
Expand Down
15 changes: 0 additions & 15 deletions type-tests/ember/ember-module-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ import type Owner from '@ember/owner';
import Ember from 'ember';
import { expectTypeOf } from 'expect-type';

// addListener
Ember.addListener({ a: 'foo' }, 'event', {}, () => {});
Ember.addListener({ a: 'foo' }, 'event', {}, 'a');
Ember.addListener({ a: 'foo' }, 'event', {}, 'b');
Ember.addListener({ a: 'foo' }, 'event', null, () => {});
// addObserver
Ember.addObserver({ a: 'foo' }, 'a', null, () => {});
Ember.addObserver({ a: 'foo' }, 'a', {}, () => {});
Expand Down Expand Up @@ -67,21 +62,11 @@ class O2 extends Ember.Object {
name = 'foo';
age = 3;
}
const o2 = O2.create({
name: 'foo',
age: 3,
});
// removeListener
Ember.removeListener(O2, 'create', null, () => {});
Ember.removeListener(O2, 'create', null, 'create');
Ember.removeListener({}, 'create', null, 'blah');
// removeObserver
Ember.removeObserver(O2, 'create', () => {});
Ember.removeObserver({}, 'create', () => {});
// runInDebug
Ember.runInDebug(() => {});
// sendEvent
expectTypeOf(Ember.sendEvent(o2, 'clicked', [1, 2])).toBeBoolean();
// set
expectTypeOf(Ember.set(O2.create(), 'name', 'bar')).toEqualTypeOf<string>();
expectTypeOf(Ember.set(O2.create(), 'age', 4)).toEqualTypeOf<number>();
Expand Down
15 changes: 0 additions & 15 deletions type-tests/ember/event.ts

This file was deleted.

Loading