Merge pull request #11850 from martndemus/remove-context-switching-each

[CLEANUP beta] Remove context switching {{each}} helper variant
emberjs · Jul 21, 2015 · a53d497 · a53d497
2 parents 90b2225 + 2f302f3
commit a53d497
Show file tree

Hide file tree

Showing 5 changed files with 207 additions and 379 deletions.
diff --git a/packages/ember-htmlbars/lib/helpers/each.js b/packages/ember-htmlbars/lib/helpers/each.js
@@ -1,6 +1,4 @@
-import Ember from 'ember-metal/core';
 import Error from 'ember-metal/error';
-import normalizeSelf from 'ember-htmlbars/utils/normalize-self';
 import shouldDisplay from 'ember-views/streams/should_display';
 import decodeEachKey from 'ember-htmlbars/utils/decode-each-key';
 
@@ -75,25 +73,16 @@ export default function eachHelper(params, hash, blocks) {
   var list = params[0];
   var keyPath = hash.key;
 
-  if (blocks.template.arity === 0) {
-    Ember.deprecate(deprecation, false, { id: 'ember-htmlbars.each-helper-arity', until: '3.0.0' });
-  }
-
   if (shouldDisplay(list)) {
     let seenKeys = {};
     forEach(list, (item, i) => {
-      var self;
-      if (blocks.template.arity === 0) {
-        self = normalizeSelf(item);
-      }
-
       var key = decodeEachKey(item, keyPath, i);
       if (seenKeys[key] === true) {
         throw new Error(`Duplicate key found ('${key}') for '{{each}}' helper, please use a unique key or switch to '{{#each model key="@index"}}{{/each}}'.`);
       } else {
         seenKeys[key] = true;
       }
-      blocks.template.yieldItem(key, [item, i], self);
+      blocks.template.yieldItem(key, [item, i]);
     });
   } else if (blocks.inverse.yield) {
     blocks.inverse.yield();
@@ -103,5 +92,3 @@ export default function eachHelper(params, hash, blocks) {
 function forEach(iterable, cb) {
   return iterable.forEach ? iterable.forEach(cb) : Array.prototype.forEach.call(iterable, cb);
 }
-
-export var deprecation = 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each items as |item|}}`) instead.';
diff --git a/packages/ember-htmlbars/tests/compat/make_bound_helper_test.js b/packages/ember-htmlbars/tests/compat/make_bound_helper_test.js
@@ -13,7 +13,6 @@ import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
 import { dasherize } from 'ember-runtime/system/string';
 
 import EmberHandlebars from 'ember-htmlbars/compat';
-import { deprecation as eachDeprecation } from 'ember-htmlbars/helpers/each';
 
 var compile, helpers, helper;
 compile = EmberHandlebars.compile;
@@ -52,12 +51,10 @@ QUnit.module('ember-htmlbars: compat - makeBoundHelper', {
 });
 
 QUnit.test('primitives should work correctly [DEPRECATED]', function() {
-  expectDeprecation(eachDeprecation);
-
   view = EmberView.create({
     prims: Ember.A(['string', 12]),
 
-    template: compile('{{#each view.prims}}{{#if this}}inside-if{{/if}}{{/each}}')
+    template: compile('{{#each view.prims as |prim|}}{{#if prim}}inside-if{{/if}}{{/each}}')
   });
 
   runAppend(view);
@@ -486,12 +483,10 @@ QUnit.test('bound helpers can handle nulls in array (with primitives) [DEPRECATE
     controller: EmberObject.create({
       things: A([null, 0, undefined, false, 'OMG'])
     }),
-    template: compile('{{#each things}}{{this}}|{{reverse this}} {{/each}}{{#each things as |thing|}}{{thing}}|{{reverse thing}} {{/each}}')
+    template: compile('{{#each things as |thing|}}{{thing}}|{{reverse thing}} {{/each}}{{#each things as |thing|}}{{thing}}|{{reverse thing}} {{/each}}')
   });
 
-  expectDeprecation(function() {
-    runAppend(view);
-  }, eachDeprecation);
+  runAppend(view);
 
   equal(view.$().text(), '|NOPE 0|NOPE |NOPE false|NOPE OMG|GMO |NOPE 0|NOPE |NOPE false|NOPE OMG|GMO ', 'helper output is correct');
 
@@ -514,12 +509,10 @@ QUnit.test('bound helpers can handle nulls in array (with objects)', function()
     controller: EmberObject.create({
       things: A([null, { foo: 5 }])
     }),
-    template: compile('{{#each things}}{{foo}}|{{print-foo this}} {{/each}}{{#each things as |thing|}}{{thing.foo}}|{{print-foo thing}} {{/each}}')
+    template: compile('{{#each things as |thing|}}{{thing.foo}}|{{print-foo thing}} {{/each}}{{#each things as |thing|}}{{thing.foo}}|{{print-foo thing}} {{/each}}')
   });
 
-  expectDeprecation(function() {
-    runAppend(view);
-  }, eachDeprecation);
+  runAppend(view);
 
   equal(view.$().text(), '|NOPE 5|5 |NOPE 5|5 ', 'helper output is correct');
 

diff --git a/packages/ember-htmlbars/tests/helpers/collection_test.js b/packages/ember-htmlbars/tests/helpers/collection_test.js
@@ -439,7 +439,7 @@ QUnit.test('should work inside a bound {{#if}}', function() {
 
 QUnit.test('should pass content as context when using {{#each}} helper [DEPRECATED]', function() {
   view = EmberView.create({
-    template: compile('{{#each view.releases}}Mac OS X {{version}}: {{name}} {{/each}}'),
+    template: compile('{{#each view.releases as |release|}}Mac OS X {{release.version}}: {{release.name}} {{/each}}'),
 
     releases: A([
                 { version: '10.7',
@@ -451,9 +451,7 @@ QUnit.test('should pass content as context when using {{#each}} helper [DEPRECAT
               ])
   });
 
-  expectDeprecation(function() {
-    runAppend(view);
-  }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each items as |item|}}`) instead.');
+  runAppend(view);
 
   equal(view.$().text(), 'Mac OS X 10.7: Lion Mac OS X 10.6: Snow Leopard Mac OS X 10.5: Leopard ', 'prints each item in sequence');
 });