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

Deprecate ember create keys #11511

Merged
merged 2 commits into from
Jun 21, 2015
Merged

Deprecate ember create keys #11511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501d473
[BUGFIX release] Deprecate Ember.create.
stefanpenner Jun 19, 2015
1ed73ac
[BUGFIX release] Deprecate Ember.keys.
stefanpenner Jun 19, 2015
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
5 changes: 3 additions & 2 deletions packages/ember-metal/lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,6 @@ Ember._Cache = Cache;

Ember.generateGuid = generateGuid;
Ember.GUID_KEY = GUID_KEY;
Ember.create = Object.create;
Ember.keys = Object.keys;
Ember.platform = {
defineProperty: true,
hasPropertyAccessors: true
Expand Down Expand Up @@ -408,4 +406,7 @@ if (Ember.__loader.registry['ember-debug']) {
requireModule('ember-debug');
}

Ember.create = Ember.deprecateFunc('Ember.create is deprecated in-favour of Object.create', Object.create);
Ember.keys = Ember.deprecateFunc('Ember.keys is deprecated in-favour of Object.keys', Object.keys);

export default Ember;
13 changes: 12 additions & 1 deletion packages/ember-metal/tests/main_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Ember from 'ember-metal/core';
import Ember from 'ember-metal';

// From sindresourhus/semver-regex https://github.com/sindresorhus/semver-regex/blob/795b05628d96597ebcbe6d31ef4a432858365582/index.js#L3
var SEMVER_REGEX = /^\bv?(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)\.(?:0|[1-9][0-9]*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?\b$/;
Expand Down Expand Up @@ -32,3 +32,14 @@ QUnit.test('SEMVER_REGEX properly validates and invalidates version numbers', fu
validateVersionString('1.11', false);
});

QUnit.test('Ember.keys is deprecated', function() {
expectDeprecation(function() {
Ember.keys({});
}, 'Ember.keys is deprecated in-favour of Object.keys');
});

QUnit.test('Ember.keys is deprecated', function() {
expectDeprecation(function() {
Ember.create(null);
}, 'Ember.create is deprecated in-favour of Object.create');
});
2 changes: 1 addition & 1 deletion packages/ember-metal/tests/watching/watch_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ testBoth('watching a regular undefined property', function(get, set) {

testBoth('watches should inherit', function(get, set) {
var obj = { foo: 'baz' };
var objB = Ember.create(obj);
var objB = Object.create(obj);

addListeners(obj, 'foo');
watch(obj, 'foo');
Expand Down
6 changes: 3 additions & 3 deletions packages/ember-routing/lib/system/router_state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember-metal/core';
import isEmpty from 'ember-metal/is_empty';
import keys from 'ember-metal/keys';
import EmberObject from 'ember-runtime/system/object';
import merge from 'ember-metal/merge';

Expand All @@ -11,7 +12,7 @@ var RouterState = EmberObject.extend({
var state = this.routerJsState;
if (!this.routerJs.isActiveIntent(routeName, models, null, state)) { return false; }

var emptyQueryParams = Ember.isEmpty(Ember.keys(queryParams));
var emptyQueryParams = isEmpty(keys(queryParams));

if (queryParamsMustMatch && !emptyQueryParams) {
var visibleQueryParams = {};
Expand All @@ -37,4 +38,3 @@ function shallowEqual(a, b) {
}

export default RouterState;

5 changes: 3 additions & 2 deletions packages/ember/tests/component_registration_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'ember';
import Ember from 'ember-metal/core';
import keys from 'ember-metal/keys';

import compile from 'ember-template-compiler/system/compile';
import helpers from 'ember-htmlbars/helpers';
Expand All @@ -12,7 +13,7 @@ function prepare() {
Ember.TEMPLATES['components/expand-it'] = compile('<p>hello {{yield}}</p>');
Ember.TEMPLATES.application = compile('Hello world {{#expand-it}}world{{/expand-it}}');

originalHelpers = Ember.A(Ember.keys(helpers));
originalHelpers = Ember.A(keys(helpers));
}

function cleanup() {
Expand All @@ -28,7 +29,7 @@ function cleanup() {
}

function cleanupHandlebarsHelpers() {
var currentHelpers = Ember.A(Ember.keys(helpers));
var currentHelpers = Ember.A(keys(helpers));

currentHelpers.forEach(function(name) {
if (!originalHelpers.contains(name)) {
Expand Down