File tree 4 files changed +7
-6
lines changed
4 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 1
1
import BasicAdapter from './basic' ;
2
2
import { typeOf } from 'ember-debug/utils/type-check' ;
3
3
4
- import Ember , { ENV } from 'ember-debug/utils/ember' ;
4
+ import { ember } from 'ember-debug/utils/ember' ;
5
5
import { run } from 'ember-debug/utils/ember/runloop' ;
6
6
7
7
const { isArray } = Array ;
@@ -105,7 +105,7 @@ export default class extends BasicAdapter {
105
105
// adapter later. See GH #1114.
106
106
const HAS_ARRAY_PROTOTYPE_EXTENSIONS = ( ( ) => {
107
107
try {
108
- return ENV . EXTEND_PROTOTYPES . Array === true ;
108
+ return ember . env . EXTEND_PROTOTYPES . Array === true ;
109
109
} catch ( e ) {
110
110
return false ;
111
111
}
Original file line number Diff line number Diff line change 25
25
emberNames . set ( Views . ClassNamesSupport , 'ClassNamesSupport Mixin' ) ;
26
26
emberNames . set ( Views . ChildViewsSupport , 'ChildViewsSupport Mixin' ) ;
27
27
emberNames . set ( Views . ViewStateSupport , 'ViewStateSupport Mixin' ) ;
28
- emberNames . set ( TargetActionSupport , 'TargetActionSupport Mixin' )
28
+ emberNames . set ( classes . TargetActionSupport , 'TargetActionSupport Mixin' )
29
29
// this one is not a Mixin, but an .extend({}), which results in a class
30
30
emberNames . set ( Views . CoreView , 'CoreView' ) ;
31
31
} catch ( e ) {
Original file line number Diff line number Diff line change 49
49
ENV : ENV_ ,
50
50
} = Ember || { } ;
51
51
52
- let getEnv = ( ) => Ember . ENV ;
53
52
let cacheFor = ( ) => null ;
54
53
55
54
if ( ! Ember ) {
Original file line number Diff line number Diff line change
1
+ import { object } from 'ember-debug/utils/ember' ;
2
+
1
3
let Ember ;
2
4
let guidFor ;
3
5
@@ -125,7 +127,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
125
127
126
128
Ember = requireModule ( 'ember-debug/utils/ember' ) ;
127
129
128
- if ( ! Ember . VERSION ) {
130
+ if ( ! Ember . ember . VERSION ) {
129
131
return ;
130
132
}
131
133
// `Ember.Application` load hook triggers before all of Ember is ready.
@@ -164,7 +166,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
164
166
165
167
if ( message . type === 'app-selected' ) {
166
168
let current = window . EmberInspector . _application ;
167
- let selected = getApplications ( ) . find ( app => guidFor ( app ) === message . applicationId ) ;
169
+ let selected = getApplications ( ) . find ( app => Ember . object . guidFor ( app ) === message . applicationId ) ;
168
170
169
171
if ( selected && current !== selected && selected . __deprecatedInstance__ ) {
170
172
bootEmberInspector ( selected . __deprecatedInstance__ ) ;
You can’t perform that action at this time.
0 commit comments