Skip to content

Commit

Permalink
Merge pull request #11448 from stefanpenner/remove-deferred
Browse files Browse the repository at this point in the history
[CLEANUP Beta]   (╯°□°)╯︵ pǝɹɹǝɟǝp
  • Loading branch information
rwjblue committed Jun 15, 2015
2 parents 3a842b6 + b8ef428 commit 0ad92a6
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 515 deletions.
5 changes: 1 addition & 4 deletions packages/ember-application/lib/system/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { get } from "ember-metal/property_get";
import { set } from "ember-metal/property_set";
import { runLoadHooks } from "ember-runtime/system/lazy_load";
import Namespace from "ember-runtime/system/namespace";
import DeferredMixin from "ember-runtime/mixins/deferred";
import DefaultResolver from "ember-application/system/resolver";
import create from "ember-metal/platform/create";
import run from "ember-metal/run_loop";
Expand Down Expand Up @@ -199,7 +198,7 @@ var librariesRegistered = false;
@public
*/

var Application = Namespace.extend(DeferredMixin, {
var Application = Namespace.extend({
_suppressDeferredDeprecation: true,

/**
Expand Down Expand Up @@ -738,8 +737,6 @@ var Application = Namespace.extend(DeferredMixin, {
Ember.Namespace.processAll();
Ember.BOOTED = true;
}

this.resolve(this);
}

this._bootResolver.resolve();
Expand Down
7 changes: 0 additions & 7 deletions packages/ember-runtime/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ import ObjectProxy from 'ember-runtime/system/object_proxy';
import CoreObject from 'ember-runtime/system/core_object';

import NativeArray from 'ember-runtime/system/native_array';
import Set from 'ember-runtime/system/set';
import EmberStringUtils from 'ember-runtime/system/string';
import Deferred from 'ember-runtime/system/deferred';
import {
onLoad,
runLoadHooks
Expand All @@ -40,7 +38,6 @@ import _ProxyMixin from 'ember-runtime/mixins/-proxy';

import Observable from 'ember-runtime/mixins/observable';
import ActionHandler from 'ember-runtime/mixins/action_handler';
import DeferredMixin from 'ember-runtime/mixins/deferred';
import MutableEnumerable from 'ember-runtime/mixins/mutable_enumerable';
import MutableArray from 'ember-runtime/mixins/mutable_array';
import TargetActionSupport from 'ember-runtime/mixins/target_action_support';
Expand Down Expand Up @@ -105,8 +102,6 @@ Ember.SortableMixin = SortableMixin;
Ember.Freezable = Freezable;
Ember.FROZEN_ERROR = FROZEN_ERROR;

Ember.DeferredMixin = DeferredMixin;

Ember.MutableEnumerable = MutableEnumerable;
Ember.MutableArray = MutableArray;

Expand Down Expand Up @@ -158,8 +153,6 @@ Ember.CoreObject = CoreObject;
Ember.NativeArray = NativeArray;
// ES6TODO: Currently we must rely on the global from ember-metal/core to avoid circular deps
// Ember.A = A;
Ember.Set = Set;
Ember.Deferred = Deferred;
Ember.onLoad = onLoad;
Ember.runLoadHooks = runLoadHooks;

Expand Down
79 changes: 0 additions & 79 deletions packages/ember-runtime/lib/mixins/deferred.js

This file was deleted.

20 changes: 0 additions & 20 deletions packages/ember-runtime/lib/system/deferred.js

This file was deleted.

Loading

0 comments on commit 0ad92a6

Please sign in to comment.