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.

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

[DOCS beta] Update Ember.deprecate and Ember.warn calls in ember-metal with required options #11839

Merged
merged 1 commit into from Jul 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion packages/ember-metal/lib/chains.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ export function flushPendingChains() {
Ember.warn(
'Watching an undefined global, Ember expects watched globals to be ' +
'setup by the time the run loop is flushed, check for typos',
pendingQueue.length === 0
pendingQueue.length === 0,
{ id: 'ember-metal.chains-flush-pending-chains' }
);
}

Expand Down
6 changes: 3 additions & 3 deletions packages/ember-metal/lib/computed_macros.js
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,14 @@ export function readOnly(dependentKey) {
@since 1.7.0
@public
*/
export function deprecatingAlias(dependentKey) {
export function deprecatingAlias(dependentKey, options) {
return computed(dependentKey, {
get(key) {
Ember.deprecate(`Usage of \`${key}\` is deprecated, use \`${dependentKey}\` instead.`);
Ember.deprecate(`Usage of \`${key}\` is deprecated, use \`${dependentKey}\` instead.`, false, options);
return get(this, dependentKey);
},
set(key, value) {
Ember.deprecate(`Usage of \`${key}\` is deprecated, use \`${dependentKey}\` instead.`);
Ember.deprecate(`Usage of \`${key}\` is deprecated, use \`${dependentKey}\` instead.`, false, options);
set(this, dependentKey, value);
return value;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-metal/lib/deprecate_property.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import { set } from 'ember-metal/property_set';
@since 1.7.0
*/

export function deprecateProperty(object, deprecatedKey, newKey) {
export function deprecateProperty(object, deprecatedKey, newKey, options) {
function deprecate() {
Ember.deprecate(`Usage of \`${deprecatedKey}\` is deprecated, use \`${newKey}\` instead.`);
Ember.deprecate(`Usage of \`${deprecatedKey}\` is deprecated, use \`${newKey}\` instead.`, false, options);
}

Object.defineProperty(object, deprecatedKey, {
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-metal/lib/libraries.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Libraries.prototype = {
}
this._registry.splice(index, 0, { name: name, version: version });
} else {
Ember.warn(`Library "${name}" is already registered with Ember.`);
Ember.warn(`Library "${name}" is already registered with Ember.`, false, { id: 'ember-metal.libraries-register' });
}
},

Expand All @@ -57,7 +57,7 @@ Libraries.prototype = {
},

each(callback) {
Ember.deprecate('Using Ember.libraries.each() is deprecated. Access to a list of registered libraries is currently a private API. If you are not knowingly accessing this method, your out-of-date Ember Inspector may be doing so.');
Ember.deprecate('Using Ember.libraries.each() is deprecated. Access to a list of registered libraries is currently a private API. If you are not knowingly accessing this method, your out-of-date Ember Inspector may be doing so.', false, { id: 'ember-metal.libraries-each', until: '3.0.0' });
this._registry.forEach((lib) => {
callback(lib.name, lib.version);
});
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-metal/lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ if (Ember.__loader.registry['ember-debug']) {
requireModule('ember-debug');
}

Ember.create = Ember.deprecateFunc('Ember.create is deprecated in favor of Object.create', Object.create);
Ember.keys = Ember.deprecateFunc('Ember.keys is deprecated in favor of Object.keys', Object.keys);
Ember.create = Ember.deprecateFunc('Ember.create is deprecated in favor of Object.create', { id: 'ember-metal.ember-create', until: '3.0.0' }, Object.create);
Ember.keys = Ember.deprecateFunc('Ember.keys is deprecated in favor of Object.keys', { id: 'ember-metal.ember.keys', until: '3.0.0' }, Object.keys);

export default Ember;
4 changes: 2 additions & 2 deletions packages/ember-metal/lib/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ OrderedSet.prototype = {
}
};

deprecateProperty(OrderedSet.prototype, 'length', 'size');
deprecateProperty(OrderedSet.prototype, 'length', 'size', { id: 'ember-metal.ordered-set-length', until: '3.0.0' });

/**
A Map stores values indexed by keys. Unlike JavaScript's
Expand Down Expand Up @@ -422,7 +422,7 @@ Map.prototype = {
}
};

deprecateProperty(Map.prototype, 'length', 'size');
deprecateProperty(Map.prototype, 'length', 'size', { id: 'ember-metal.map-length', until: '3.0.0' });

/**
@class MapWithDefault
Expand Down
6 changes: 3 additions & 3 deletions packages/ember-metal/lib/mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ REQUIRED.toString = function() { return '(Required Property)'; };
@private
*/
export function required() {
Ember.deprecate('Ember.required is deprecated as its behavior is inconsistent and unreliable.', false);
Ember.deprecate('Ember.required is deprecated as its behavior is inconsistent and unreliable.', false, { id: 'ember-metal.required', until: '3.0.0' });
return REQUIRED;
}

Expand Down Expand Up @@ -809,7 +809,7 @@ export function observer(...args) {

if (typeof func !== 'function') {
// revert to old, soft-deprecated argument ordering
Ember.deprecate('Passing the dependentKeys after the callback function in Ember.observer is deprecated. Ensure the callback function is the last argument.');
Ember.deprecate('Passing the dependentKeys after the callback function in Ember.observer is deprecated. Ensure the callback function is the last argument.', false, { id: 'ember-metal.observer-argument-order', until: '3.0.0' });

func = args[0];
_paths = args.slice(1);
Expand Down Expand Up @@ -855,7 +855,7 @@ export function observer(...args) {
@private
*/
export function _immediateObserver() {
Ember.deprecate('Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead.');
Ember.deprecate('Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead.', false, { id: 'ember-metal.immediate-observer', until: '3.0.0' });

for (var i = 0, l = arguments.length; i < l; i++) {
var arg = arguments[i];
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-routing-views/lib/views/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var LinkComponent = EmberComponent.extend({
@property currentWhen
@private
*/
currentWhen: deprecatingAlias('current-when'),
currentWhen: deprecatingAlias('current-when', { id: 'ember-routing-view.deprecated-current-when', until: '3.0.0' }),

/**
Used to determine when this LinkComponent is active.
Expand Down