Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Descriptor is no longer exposed on the Ember global. #327

Merged
merged 1 commit into from
Mar 21, 2015
Merged

Descriptor is no longer exposed on the Ember global. #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion ember_debug/object-inspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,22 @@ function inspectValue(value) {
} else if (isComputed(value)) {
string = "<computed>";
return { type: "type-descriptor", inspect: string, computed: true };
} else if (value instanceof Descriptor) {
} else if (isDescriptor(value)) {
return { type: "type-descriptor", inspect: value.toString(), computed: true };
} else {
return { type: "type-" + typeOf(value), inspect: inspect(value) };
}
}

function isDescriptor(value) {
// Ember < 1.11
if (Descriptor !== undefined) {
return value instanceof Descriptor;
}
// Ember >= 1.11
return value && typeof value === 'object' && value.isDescriptor;
}

function inspect(value) {
if (typeof value === 'function') {
return "function() { ... }";
Expand Down