Merge pull request #841 from TheCloudlessSky/itemViewContainer-context

Call the itemViewContainer in the context of the CompositeView
marionettejs · Jan 8, 2014 · 871083d · 871083d
2 parents 04021d2 + 18d8316
commit 871083d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/spec/javascripts/compositeView-itemViewContainer.spec.js b/spec/javascripts/compositeView-itemViewContainer.spec.js
@@ -218,4 +218,28 @@ describe("composite view - itemViewContainer", function(){
 
   });
 
+  describe("when a composite view has the `itemViewContainer` specified as a function", function() {
+
+    var CompositeView = Backbone.Marionette.CompositeView.extend({
+      itemView: ItemView,
+      template: "#composite-child-container-template"
+    });
+
+    it("calls the `itemViewContainer` in the context of the composite view", function() {
+      loadFixtures("compositeChildContainerTemplate.html");
+      var collection = new Collection([{ foo: "bar" }, { foo: "baz" }]);
+      var compositeView = new CompositeView({ collection: collection });
+      var context;
+      compositeView.itemViewContainer = function() {
+        context = this;
+        return "ul";
+      };
+
+      compositeView.render();
+
+      expect(context).toBe(compositeView);
+    });
+
+  });
+
 });
diff --git a/src/marionette.compositeview.js b/src/marionette.compositeview.js
@@ -134,7 +134,7 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
     var itemViewContainer = Marionette.getOption(containerView, "itemViewContainer");
     if (itemViewContainer){
 
-      var selector = _.isFunction(itemViewContainer) ? itemViewContainer() : itemViewContainer;
+      var selector = _.isFunction(itemViewContainer) ? itemViewContainer.call(this) : itemViewContainer;
       container = containerView.$(selector);
       if (container.length <= 0) {
         throwError("The specified `itemViewContainer` was not found: " + containerView.itemViewContainer, "ItemViewContainerMissingError");