Merge pull request emberjs#1163 from ghempton/context-fix

Fixed view context lookup issue.
joewest · Jul 13, 2012 · 7d0d836 · 7d0d836
2 parents d0fd522 + fac3864
commit 7d0d836
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/packages/ember-handlebars/lib/helpers/view.js b/packages/ember-handlebars/lib/helpers/view.js
@@ -164,7 +164,7 @@ EmberHandlebars.ViewHelper = Ember.Object.create({
 
     // We only want to override the `_context` computed property if there is
     // no specified controller. See View#_context for more information.
-    if (!newView.proto().controller && !newView.proto().controllerBinding && !viewOptions.controller && !newView.controllerBinding) {
+    if (!newView.proto().controller && !newView.proto().controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
       viewOptions._context = thisContext;
     }
 

diff --git a/packages/ember-handlebars/tests/helpers/each_test.js b/packages/ember-handlebars/tests/helpers/each_test.js
@@ -204,4 +204,19 @@ if (Ember.VIEW_PRESERVES_CONTEXT) {
     equal(view.$().text(), "AdamSteve");
   });
 
+  test("controller is assignable inside an #each", function() {
+    var controller = Ember.ArrayController.create({
+      content: Ember.A([ { name: "Adam" }, { name: "Steve" } ])
+    });
+
+    view = Ember.View.create({
+      controller: controller,
+      template: templateFor('{{#each itemController in this}}{{#view controllerBinding="itemController"}}{{name}}{{/view}}{{/each}}')
+    });
+
+    append(view);
+
+    equal(view.$().text(), "AdamSteve");
+  });
+
 }