Throw error when using view template helper with selector region

jridgewell · Jan 3, 2015 · 448e251 · 448e251
1 parent 2c5ed73
commit 448e251
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/region.js b/src/region.js
@@ -21,6 +21,10 @@ function attributeReducer(attributes, left, right) {
     }).join('');
 }
 
+function throwPlaceholder() {
+    throw new Error('Cannot use view template helper with region declared using a selector');
+}
+
 _.extend(Minionette.Region.prototype, Backbone.Events, {
     PlaceholderView: Backbone.View.extend({
         // Use a span so it collapses on the DOM.
@@ -80,7 +84,10 @@ _.extend(Minionette.Region.prototype, Backbone.Events, {
         // And set our views' _parent to this region.
         this.view._parent = this;
 
-        _.extend(this, _.pick(options, 'selector'));
+        if (options.selector) {
+            this.selector = options.selector;
+            this.placeholder = throwPlaceholder;
+        }
     },
 
     // Ensures that the view's el is contained inside the parent view's.

diff --git a/test/specs/region_spec.js b/test/specs/region_spec.js
@@ -257,6 +257,7 @@ describe('Minionette.Region', function() {
             var selector = ':first-child';
             region = view.addRegion('subview', selector);
             region.attach(newView);
+            view.template = '<p></p><span></span>';
 
             view.render();
 
@@ -266,11 +267,11 @@ describe('Minionette.Region', function() {
         });
 
         it("will correctly render even when not rendered and initialized with jQuery object", function() {
-            var selector = ':first-child',
-                $selector = view.$(selector);
+            var selector = ':first-child';
+            var $selector = view.$(selector);
             region = view.addRegion('subview', $selector);
             region.attach(newView);
-
+            view.template = '<p></p><span></span>';
 
             view.render();
 

diff --git a/test/specs/view_spec.js b/test/specs/view_spec.js
@@ -440,7 +440,13 @@ describe('Minionette.View', function() {
             });
 
             it("throws error if it cannot reattach region", function() {
-                var region = view.addRegion('subview', 'notexist');
+                view.addRegion('subview', 'notexist');
+                expect(function() { view.render(); }).to.throw(Error);
+            });
+
+            it("throws error if view template helper used with selector region", function() {
+                view.addRegion('subview', 'p');
+                view.template = _.template('<p></p><%= view("subview") %>');
 
                 expect(function() { view.render(); }).to.throw(Error);
             });