closes #1803

riot · May 22, 2016 · 70913ff · 70913ff
1 parent cbdafa4
commit 70913ff
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/lib/browser/tag/tag.js b/lib/browser/tag/tag.js
@@ -29,7 +29,9 @@ function Tag(impl, conf, innerHTML) {
   // it could be handy to use it also to improve the virtual dom rendering speed
   defineProperty(this, '_riot_id', ++__uid) // base 1 allows test !t._riot_id
 
-  extend(this, { parent: parent, root: root, opts: opts, tags: {} }, item)
+  extend(this, { parent: parent, root: root, opts: opts}, item)
+  // protect the "tags" property from being overridden
+  defineProperty(this, 'tags', {})
 
   // grab attributes
   each(root.attributes, function(el) {

diff --git a/test/specs/browser/compiler.js b/test/specs/browser/compiler.js
@@ -1126,6 +1126,12 @@ describe('Compiler Browser', function() {
     tags.push(tag)
   })
 
+  it('protect the internal "tags" attribute from external overrides', function() {
+    var tag = riot.mount('loop-protect-internal-attrs')[0]
+    expect(tag.tags['loop-protect-internal-attrs-child'].length).to.be(4)
+    tags.push(tag)
+  })
+
   it('preserve the mount order, first the parent and then all the children', function() {
     var correctMountingOrder = [
         'deferred-mount',

diff --git a/test/specs/browser/tags-bootstrap.js b/test/specs/browser/tags-bootstrap.js
@@ -84,6 +84,8 @@ loadTagsAndScripts([
 
   'tag/obj-key-loop.tag',
 
+  'tag/loop-protect-internal-attrs.tag',
+
   'tag/loop-svg-nodes.tag',
 
   // these tags will be not autoinjected in the DOM

diff --git a/test/tag/loop-protect-internal-attrs.tag b/test/tag/loop-protect-internal-attrs.tag
@@ -0,0 +1,17 @@
+
+<loop-protect-internal-attrs>
+
+  <div each={ items }>
+    <loop-protect-internal-attrs-child></loop-protect-internal-attrs-child>
+  </div>
+
+  this.items = [
+    { foo: 'foo', tags: 'tags' },
+    { foo: 'foo', tags: 'tags' },
+    { foo: 'foo', tags: 'tags' },
+    { foo: 'foo', tags: 'tags' }
+  ]
+
+</loop-protect-internal-attrs>
+
+<loop-protect-internal-attrs-child></loop-protect-internal-attrs-child>