From dc8e2b9972660bf0d6986dd299859caeb3aacd17 Mon Sep 17 00:00:00 2001 From: Doug Yun Date: Fri, 3 Jul 2015 11:20:21 -0700 Subject: [PATCH] [CLEANUP beta] - Remove `mapProperty` --- .../lib/computed/reduce_computed_macros.js | 13 ------------- packages/ember-runtime/lib/main.js | 2 -- packages/ember-runtime/lib/mixins/enumerable.js | 13 ------------- .../ember-runtime/tests/suites/enumerable/mapBy.js | 5 ----- 4 files changed, 33 deletions(-) diff --git a/packages/ember-runtime/lib/computed/reduce_computed_macros.js b/packages/ember-runtime/lib/computed/reduce_computed_macros.js index 337736f3912..fa47c67ee46 100644 --- a/packages/ember-runtime/lib/computed/reduce_computed_macros.js +++ b/packages/ember-runtime/lib/computed/reduce_computed_macros.js @@ -213,19 +213,6 @@ export function mapBy(dependentKey, propertyKey) { return map(`${dependentKey}.@each.${propertyKey}`, item => get(item, propertyKey)); } -/** - @method mapProperty - @for Ember.computed - @deprecated Use `Ember.computed.mapBy` instead - @param dependentKey - @param propertyKey - @public -*/ -export function mapProperty() { - Ember.deprecate('Ember.computed.mapProperty is deprecated. Please use Ember.computed.mapBy.'); - return mapBy.apply(this, arguments); -} - /** Filters the array by the callback. diff --git a/packages/ember-runtime/lib/main.js b/packages/ember-runtime/lib/main.js index 1437006e0a0..d9aea0f5602 100644 --- a/packages/ember-runtime/lib/main.js +++ b/packages/ember-runtime/lib/main.js @@ -53,7 +53,6 @@ import { sort, setDiff, mapBy, - mapProperty, filter, filterBy, uniq, @@ -115,7 +114,6 @@ EmComputed.map = map; EmComputed.sort = sort; EmComputed.setDiff = setDiff; EmComputed.mapBy = mapBy; -EmComputed.mapProperty = mapProperty; EmComputed.filter = filter; EmComputed.filterBy = filterBy; EmComputed.uniq = uniq; diff --git a/packages/ember-runtime/lib/mixins/enumerable.js b/packages/ember-runtime/lib/mixins/enumerable.js index a092aca29d6..cedcd0d0449 100644 --- a/packages/ember-runtime/lib/mixins/enumerable.js +++ b/packages/ember-runtime/lib/mixins/enumerable.js @@ -358,19 +358,6 @@ export default Mixin.create({ }); }, - /** - Similar to map, this specialized function returns the value of the named - property on all items in the enumeration. - - @method mapProperty - @param {String} key name of the property - @return {Array} The mapped array. - @deprecated Use `mapBy` instead - @private - */ - - mapProperty: aliasMethod('mapBy'), - /** Returns an array with all of the items in the enumeration that the passed function returns true for. This method corresponds to `filter()` defined in diff --git a/packages/ember-runtime/tests/suites/enumerable/mapBy.js b/packages/ember-runtime/tests/suites/enumerable/mapBy.js index 0ffbb7bbb04..bee3d179e4f 100644 --- a/packages/ember-runtime/tests/suites/enumerable/mapBy.js +++ b/packages/ember-runtime/tests/suites/enumerable/mapBy.js @@ -14,9 +14,4 @@ suite.test('should work also through getEach alias', function() { equal(obj.getEach('a').join(''), '12'); }); -suite.test('should be aliased to mapProperty', function() { - var obj = this.newObject([]); - equal(obj.mapProperty, obj.mapBy); -}); - export default suite;