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

Remove Ember.Descriptor from exports #10672

Merged
merged 1 commit into from
Mar 19, 2015
Merged

Remove Ember.Descriptor from exports #10672

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion packages/ember-metal/lib/computed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ function UNDEFINED() { }

@class ComputedProperty
@namespace Ember
@extends Ember.Descriptor
@constructor
*/
function ComputedProperty(config, opts) {
Expand Down
1 change: 0 additions & 1 deletion packages/ember-metal/lib/injected_property.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import create from "ember-metal/platform/create";

@class InjectedProperty
@namespace Ember
@extends Ember.Descriptor
@constructor
@param {String} type The container type the property will lookup
@param {String} name (optional) The name the property will lookup, defaults
Expand Down
1 change: 0 additions & 1 deletion packages/ember-metal/lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ Ember.beginPropertyChanges = beginPropertyChanges;
Ember.endPropertyChanges = endPropertyChanges;
Ember.changeProperties = changeProperties;

Ember.Descriptor = Descriptor;
Ember.defineProperty = defineProperty;

Ember.set = set;
Expand Down
1 change: 0 additions & 1 deletion packages/ember-metal/lib/mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,6 @@ Alias.prototype = new Descriptor();
@method aliasMethod
@for Ember
@param {String} methodName name of the method to alias
@return {Ember.Descriptor}
*/
export function aliasMethod(methodName) {
return new Alias(methodName);
Expand Down
11 changes: 2 additions & 9 deletions packages/ember-metal/lib/properties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ import { overrideChains } from "ember-metal/property_events";
/**
Objects of this type can implement an interface to respond to requests to
get and set. The default implementation handles simple properties.

You generally won't need to create or subclass this directly.

@class Descriptor
@namespace Ember
@private
@constructor
*/
export function Descriptor() {
this.isDescriptor = true;
Expand Down Expand Up @@ -55,7 +48,7 @@ export function DEFAULT_GETTER_FUNCTION(name) {
properties and other special descriptors.

Normally this method takes only three parameters. However if you pass an
instance of `Ember.Descriptor` as the third param then you can pass an
instance of `Descriptor` as the third param then you can pass an
optional value as the fourth parameter. This is often more efficient than
creating new descriptor hashes for each property.

Expand Down Expand Up @@ -84,7 +77,7 @@ export function DEFAULT_GETTER_FUNCTION(name) {
@for Ember
@param {Object} obj the object to define this property on. This may be a prototype.
@param {String} keyName the name of the property
@param {Ember.Descriptor} [desc] an instance of `Ember.Descriptor` (typically a
@param {Descriptor} [desc] an instance of `Descriptor` (typically a
computed property) or an ES5 descriptor.
You must provide this or `data` but not both.
@param {*} [data] something other than a descriptor, that will
Expand Down