Merge pull request #2 from PolymerLabs/fix-annote

minimal repair to annotation system to account for scoping.

polymer/src/features/annotations.html

@@ -64,8 +64,14 @@
 
     // instance-time method
     findAnnotatedNode: function(root, annote) {
-      return !annote.parent ? root : 
-        this.findAnnotatedNode(root, annote.parent).childNodes[annote.index];
+      if (!annote.parent) {
+        return root;
+      }
+      var parent = this.findAnnotatedNode(root, annote.parent);
+      // enforce locality.
+      var nodes = (parent === this) ? parent.childNodes : 
+        (parent.lightChildren || parent.childNodes);
+      return nodes[annote.index];
     },
 
     _parseTemplateNode: function(node, map) {

polymer/src/features/content.html

@@ -4,6 +4,8 @@
 
     register: function(prototype) {
       var t = prototype._template;
+      // TODO(sorvell): is qsa is wrong here due to distribution?
+      // needs to be found via annotation system
       prototype._useContent = Boolean(t && t.content.querySelector('content'));
     },
 
@@ -14,6 +16,8 @@
         pool.appendChild(this.firstChild);
       }
       this.contentPool = pool;
+      // capture lightChildren to help reify dom scoping.
+      this.lightChildren = Array.prototype.slice.call(this.contentPool.childNodes, 0);
     },
 
     distributeContent: function() {

polymer/src/features/template.html

@@ -30,6 +30,7 @@
     },
 
     _stampTemplate: function(template, target) {
+      // TODO(sorvell): light dom children will invalidate annotations.
       target.insertBefore(this.instanceTemplate(template), 
         target.firstElementChild);
     },
@@ -40,4 +41,4 @@
 
   });
 
-</script>
+</script>