Ensure _template from behaviors takes precedence over is in legacy.

Polymer · Nov 1, 2018 · 08b267f · 08b267f
1 parent fb5a7e3
commit 08b267f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/legacy/class.html b/lib/legacy/class.html
@@ -351,6 +351,15 @@
         Polymer.LegacyElementMixin(HTMLElement));
       // decorate klass with registration info
       klass.is = info.is;
+      // To match 1.x behavior, `_template` supplied on a behavior should take
+      // precedence over dom-module lookup for `is`; this also prevents
+      // dom-module injection under strictTemplatePolicy for an element that
+      // would normally get its template from a behavior.
+      // TODO(sorvell): Remove once "flattened behaviors" lands, since both
+      // `_template` and `is` will be on the same class after that change
+      if (klass.prototype._template !== undefined) {
+        klass.prototype._template = klass.prototype._template;
+      }
       return klass;
     };
 

diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
@@ -602,8 +602,8 @@
 
   test('template from base', function() {
     var el = fixture('from-base');
-    assert.ok(el.shadowRoot.querySelector('#from-base'));
-    assert.notOk(el.shadowRoot.querySelector('#from-behavior1'));
+    assert.notOk(el.shadowRoot.querySelector('#from-base'));
+    assert.ok(el.shadowRoot.querySelector('#from-behavior1'));
   });
 
   test('template from behavior', function() {