From 87e312f1d72366f35028d742acd028929106501f Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Mon, 14 Nov 2016 17:35:23 -0800
Subject: [PATCH] Make sure text nodes are distributed when translating slot to
 content

Fixes #4109
---
 src/lib/annotations/annotations.html   | 5 +++--
 test/unit/polymer-dom-content.html     | 7 +++++--
 test/unit/styling-scoped-elements.html | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html
index 438d4fdc21..1974b03fdb 100644
--- a/src/lib/annotations/annotations.html
+++ b/src/lib/annotations/annotations.html
@@ -281,8 +281,9 @@
         content.setAttribute(attr.name, attr.value);
       }
       var name = slot.getAttribute('name');
-      var select = name ? '[slot=\'' + name + '\']' : ':not([slot])'; 
-      content.setAttribute('select', select);
+      if (name) {
+        content.setAttribute('select', '[slot=\'' + name + '\']');
+      }
       slot.parentNode.replaceChild(content, slot);
       return content;
     },
diff --git a/test/unit/polymer-dom-content.html b/test/unit/polymer-dom-content.html
index 2a70eaeb9f..63ae8fd642 100644
--- a/test/unit/polymer-dom-content.html
+++ b/test/unit/polymer-dom-content.html
@@ -32,8 +32,8 @@
 <dom-module id="x-dist-slot">
   <template>
     x-dist
-    <div id="default"><slot id="defaultIP"><div>fallback for default</div></slot></div>
     <div id="foo"><slot id="fooIP" name="foo"><div>fallback for foo</div></slot></div>
+    <div id="default"><slot id="defaultIP"><div>fallback for default</div></slot></div>
   </template>
   <script>
   HTMLImports.whenReady(function() {
@@ -356,7 +356,7 @@
       assert.equal(dist.$.fooIP.localName, 'content');
       assert.equal(dist.$.fooIP.getAttribute('select'), '[slot=\'foo\']');
       assert.equal(dist.$.defaultIP.localName, 'content');
-      assert.equal(dist.$.defaultIP.getAttribute('select'), ':not([slot])');
+      assert.equal(dist.$.defaultIP.getAttribute('select'), null);
       assert.equal(Polymer.dom(dist.$.fooIP).getDistributedNodes()[0].textContent, 'fallback for foo');
       assert.equal(Polymer.dom(dist.$.defaultIP).getDistributedNodes()[0].textContent, 'fallback for default');
       // Distribute div
@@ -365,6 +365,7 @@
       var default1 = frag.appendChild(document.createElement('div'));
       var foo2 = frag.appendChild(document.createElement('div'));
       var default2 = frag.appendChild(document.createElement('div'));
+      var defaultText = frag.appendChild(document.createTextNode('distributed text'));
       foo1.setAttribute('slot', 'foo');
       foo2.setAttribute('slot', 'foo');
       Polymer.dom(dist).appendChild(frag);
@@ -373,11 +374,13 @@
       assert.equal(Polymer.dom(dist.$.fooIP).getDistributedNodes()[1], foo2);
       assert.equal(Polymer.dom(dist.$.defaultIP).getDistributedNodes()[0], default1);
       assert.equal(Polymer.dom(dist.$.defaultIP).getDistributedNodes()[1], default2);
+      assert.equal(Polymer.dom(dist.$.defaultIP).getDistributedNodes()[2], defaultText);
       // Remove
       Polymer.dom(dist).removeChild(foo1);
       Polymer.dom(dist).removeChild(foo2);
       Polymer.dom(dist).removeChild(default1);
       Polymer.dom(dist).removeChild(default2);
+      Polymer.dom(dist).removeChild(defaultText);
       Polymer.dom.flush();
       assert.equal(Polymer.dom(dist.$.fooIP).getDistributedNodes()[0].textContent, 'fallback for foo');
       assert.equal(Polymer.dom(dist.$.fooIP).getDistributedNodes()[1], null);
diff --git a/test/unit/styling-scoped-elements.html b/test/unit/styling-scoped-elements.html
index dcebbcfa65..0c160cb62c 100644
--- a/test/unit/styling-scoped-elements.html
+++ b/test/unit/styling-scoped-elements.html
@@ -621,10 +621,10 @@
       border: 8px solid green;
     }
     </style>
-    <slot></slot>
     <div id="container">
       <slot name="container"></slot>
     </div>
+    <slot></slot>
   </template>
   <script>
     Polymer({is: 'x-slotted'});