Merge pull request #2082 from Polymer/fix-2081

Fixes #2081
Polymer · Jul 15, 2015 · a230ffb · a230ffb
2 parents 7606f24 + a6bd5a5
commit a230ffb
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/src/lib/dom-api.html b/src/lib/dom-api.html
@@ -688,12 +688,14 @@
       }
 
       DomApi.prototype.getDestinationInsertionPoints = function() {
-        var n$ = this.node.getDestinationInsertionPoints();
+        var n$ = this.node.getDestinationInsertionPoints && 
+          this.node.getDestinationInsertionPoints();
         return n$ ? Array.prototype.slice.call(n$) : [];
       };
 
       DomApi.prototype.getDistributedNodes = function() {
-        var n$ = this.node.getDistributedNodes();
+        var n$ = this.node.getDistributedNodes && 
+          this.node.getDistributedNodes();
         return n$ ? Array.prototype.slice.call(n$) : [];
       };
 

diff --git a/src/standard/utils.html b/src/standard/utils.html
@@ -116,8 +116,8 @@
      * @return {Array<Node>} List of distributed nodes for the `<content>`.
      */
     getContentChildNodes: function(slctr) {
-      return Polymer.dom(Polymer.dom(this.root).querySelector(
-          slctr || 'content')).getDistributedNodes();
+      var content = Polymer.dom(this.root).querySelector(slctr || 'content');
+      return content ? Polymer.dom(content).getDistributedNodes() : [];
     },
 
     /**

diff --git a/test/runner.html b/test/runner.html
@@ -37,6 +37,8 @@
       'unit/gestures.html',
       'unit/utils.html',
       'unit/utils-content.html',
+      'unit/utils.html?dom=shadow',
+      'unit/utils-content.html?dom=shadow',
       'unit/resolveurl.html',
       'unit/css-parse.html',
       'unit/styling-scoped.html',

diff --git a/test/unit/polymer-dom.js b/test/unit/polymer-dom.js
@@ -810,4 +810,14 @@ suite('Polymer.dom non-distributed elements', function() {
     Polymer.dom(c1).appendChild(test);
     assert.notOk(Polymer.dom(test).getOwnerRoot(), 'getOwnerRoot incorrect for child moved from a root to no root');
   });
+
+  test('getDistributedNodes on non-content element', function() {
+    assert.equal(Polymer.dom(document.createElement('div')).getDistributedNodes().length, 0);
+        assert.equal(Polymer.dom().getDistributedNodes().length, 0);
+  });
+
+  test('getDestinationInsertionPoints on non-distributable element', function() {
+    assert.equal(Polymer.dom(document.createElement('div')).getDestinationInsertionPoints().length, 0);
+    assert.equal(Polymer.dom(document).getDestinationInsertionPoints().length, 0);
+  });
 });
diff --git a/test/unit/utils-content.html b/test/unit/utils-content.html
@@ -78,6 +78,16 @@
         nodes = elt3.getContentChildren('[select=span]');
         assert.equal(nodes.length, 4, 'should have 4 spans');
       });
+
+      test('getContentChildNodes with non-existent selector', function() {
+        var nodes = elt3.getContentChildNodes('[dne]');
+        assert.equal(nodes.length, 0, 'should find 0 nodes');
+      });
+
+      test('getContentChildren with non-existent selector', function() {
+        var nodes = elt3.getContentChildren('[dne]');
+        assert.equal(nodes.length, 0, 'should find 0 nodes');
+      });
 
     });