cleaning up the getItemViewContainer method a bit, and adding a bette…

…r error message when the container element is not found. closes marionettejs#200
kevindente · Sep 29, 2012 · f5fd8bd · f5fd8bd
1 parent 5b1ec98
commit f5fd8bd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/spec/javascripts/compositeView-itemViewContainer.spec.js b/spec/javascripts/compositeView-itemViewContainer.spec.js
@@ -78,7 +78,7 @@ describe("composite view - itemViewContainer", function(){
     });
 
     it("should throw an error", function(){
-      expect(function(){compositeView.render()}).toThrow("Missing `itemViewContainer`");
+      expect(function(){compositeView.render()}).toThrow("The specified `itemViewContainer` was not found: #missing-container");
     });
   });
 

diff --git a/src/backbone.marionette.compositeview.js b/src/backbone.marionette.compositeview.js
@@ -87,23 +87,25 @@ Marionette.CompositeView = Marionette.CollectionView.extend({
   // Internal method to ensure an `$itemViewContainer` exists, for the
   // `appendHtml` method to use.
   getItemViewContainer: function(containerView){
-    var container;
     if ("$itemViewContainer" in containerView){
-      container = containerView.$itemViewContainer;
-    } else {
-      if (containerView.itemViewContainer){
-        container = containerView.$(_.result(containerView, "itemViewContainer"));
-
-        if (container.length <= 0) {
-          var err = new Error("Missing `itemViewContainer`");
-          err.name = "ItemViewContainerMissingError";
-          throw err;
-        }
-      } else {
-        container = containerView.$el;
+      return containerView.$itemViewContainer;
+    }
+
+    var container;
+    if (containerView.itemViewContainer){
+
+      container = containerView.$(_.result(containerView, "itemViewContainer"));
+      if (container.length <= 0) {
+        var err = new Error("The specified `itemViewContainer` was not found: " + containerView.itemViewContainer);
+        err.name = "ItemViewContainerMissingError";
+        throw err;
       }
-      containerView.$itemViewContainer = container;
+
+    } else {
+      container = containerView.$el;
     }
+
+    containerView.$itemViewContainer = container;
     return container;
   },