template ref should check treeScope.getElementById

R=arv BUG= Review URL: https://codereview.appspot.com/9519043
googlearchive · May 18, 2013 · 7de0697 · 7de0697
1 parent 2c675ca
commit 7de0697
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/template_element.js b/src/template_element.js
@@ -24,6 +24,14 @@
 
   var filter = Array.prototype.filter.call.bind(Array.prototype.filter);
 
+  function getTreeScope(node) {
+    while (node.parentNode) {
+      node = node.parentNode;
+    }
+
+    return typeof node.getElementById === 'function' ? node : null;
+  }
+
   var Map;
   if (global.Map && typeof global.Map.prototype.forEach === 'function') {
     Map = global.Map;
@@ -839,8 +847,11 @@
     get ref() {
       var ref;
       var refId = this.getAttribute('ref');
-      if (refId)
-        ref = this.ownerDocument.getElementById(refId);
+      if (refId) {
+        var treeScope = getTreeScope(this);
+        if (treeScope)
+          ref = treeScope.getElementById(refId);
+      }
 
       if (!ref)
         ref = templateInstanceRefTable.get(this);

diff --git a/tests/template_element.js b/tests/template_element.js
@@ -1456,6 +1456,16 @@ suite('Template Element', function() {
     }
   });
 
+  test('BindShadowDOM Template Ref', function() {
+    if (HTMLElement.prototype.webkitCreateShadowRoot) {
+      var root = createShadowTestHtml(
+          '<template id=foo>Hi</template><template bind ref=foo></template>');
+      recursivelySetTemplateModel(root, {});
+      Platform.performMicrotaskCheckpoint();
+      assert.strictEqual(3, root.childNodes.length);
+    }
+  });
+
   // https://github.com/Polymer/mdv/issues/8
   test('UnbindingInNestedBind', function() {
     var div = createTestHtml(