fixed case when no tag is set

crisward · Jan 26, 2016 · 8276887 · 8276887
1 parent 5782e97
commit 8276887
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/lib/subtag.js b/lib/subtag.js
@@ -2,6 +2,9 @@
 riot.tag('subtag', '<div riot-tag="{opts.tag}"></div>', function(opts) {this.prevtag = null;
 
 this.on('mount', function() {
+  if (!opts.tag) {
+    return;
+  }
   this.prevtag = opts.tag;
   return this.mountedTag = riot.mount(this.root.querySelector('div'), opts.tag, opts)[0];
 });
@@ -15,7 +18,9 @@ this.on('update', function() {
 });
 
 this.on('unmount', function() {
-  return this.mountedTag.unmount(true);
+  if (this.mountedTag) {
+    return this.mountedTag.unmount(true);
+  }
 });
 
 });
diff --git a/src/subtag.tag b/src/subtag.tag
@@ -5,6 +5,7 @@ subtag
     @prevtag = null
 
     @on 'mount',->
+      return if !opts.tag
       @prevtag = opts.tag
       @mountedTag = riot.mount(@root.querySelector('div'),opts.tag,opts)[0]
 
@@ -15,4 +16,4 @@ subtag
         @mountedTag = riot.mount(@root.querySelector('div'),opts.tag,opts)[0]
 
     @on 'unmount',->
-      @mountedTag.unmount(true)
+      @mountedTag.unmount(true) if @mountedTag
diff --git a/test/subtag.coffee b/test/subtag.coffee
@@ -37,3 +37,8 @@ describe "subtag",->
     opts = {tag:'tag2'}
     @tag = riot.mount(@domnode,'subtag',opts)[0]
     expect(window.hasunmounted).to.be.true
+
+  it "shouldn't go mental if no tag is set",->
+    opts = {}
+    @tag = riot.mount(@domnode,'subtag',opts)[0]
+