Skip to content

Commit 37198f6

Browse files
committed
fix
1 parent 1684059 commit 37198f6

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

ember_debug/adapters/web-extension.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import BasicAdapter from './basic';
22
import { typeOf } from 'ember-debug/utils/type-check';
33

4-
import Ember, { ENV } from 'ember-debug/utils/ember';
4+
import { ember } from 'ember-debug/utils/ember';
55
import { run } from 'ember-debug/utils/ember/runloop';
66

77
const { isArray } = Array;
@@ -105,7 +105,7 @@ export default class extends BasicAdapter {
105105
// adapter later. See GH #1114.
106106
const HAS_ARRAY_PROTOTYPE_EXTENSIONS = (() => {
107107
try {
108-
return ENV.EXTEND_PROTOTYPES.Array === true;
108+
return ember.env.EXTEND_PROTOTYPES.Array === true;
109109
} catch (e) {
110110
return false;
111111
}

ember_debug/utils/ember-object-names.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ try {
2525
emberNames.set(Views.ClassNamesSupport, 'ClassNamesSupport Mixin');
2626
emberNames.set(Views.ChildViewsSupport, 'ChildViewsSupport Mixin');
2727
emberNames.set(Views.ViewStateSupport, 'ViewStateSupport Mixin');
28-
emberNames.set(TargetActionSupport, 'TargetActionSupport Mixin')
28+
emberNames.set(classes.TargetActionSupport, 'TargetActionSupport Mixin')
2929
// this one is not a Mixin, but an .extend({}), which results in a class
3030
emberNames.set(Views.CoreView, 'CoreView');
3131
} catch (e) {

ember_debug/utils/ember.js

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ let {
4949
ENV: ENV_,
5050
} = Ember || {};
5151

52-
let getEnv = () => Ember.ENV;
5352
let cacheFor = () => null;
5453

5554
if (!Ember) {

ember_debug/vendor/startup-wrapper.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { object } from 'ember-debug/utils/ember';
2+
13
let Ember;
24
let guidFor;
35

@@ -125,7 +127,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
125127

126128
Ember = requireModule('ember-debug/utils/ember');
127129

128-
if (!Ember.VERSION) {
130+
if (!Ember.ember.VERSION) {
129131
return;
130132
}
131133
// `Ember.Application` load hook triggers before all of Ember is ready.
@@ -164,7 +166,7 @@ let EMBER_VERSIONS_SUPPORTED = {{EMBER_VERSIONS_SUPPORTED}};
164166

165167
if (message.type === 'app-selected') {
166168
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);
168170

169171
if (selected && current !== selected && selected.__deprecatedInstance__) {
170172
bootEmberInspector(selected.__deprecatedInstance__);

0 commit comments

Comments
 (0)