Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing support for returning strings from template getter. #5222

Merged
merged 11 commits into from
May 8, 2018
Merged

Removing support for returning strings from template getter. #5222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
956bba7
Update README for 3.x
kevinpschaaf May 4, 2018
e924ba8
Minor tweaks
kevinpschaaf May 4, 2018
928c47f
Fix LitElement typo
kevinpschaaf May 4, 2018
ee6a67e
Re-order sections
kevinpschaaf May 4, 2018
fc0ce18
Fix link
kevinpschaaf May 4, 2018
fb7630c
Tweak wording.
kevinpschaaf May 4, 2018
d896cdd
Readme: very small tweaks
May 4, 2018
b823620
Tweak introductory note, fix webpack capitalization
May 4, 2018
c54ff70
Fix typos and nits
kevinpschaaf May 7, 2018
bd05abf
Merge pull request #5218 from Polymer/3.x-readme
kevinpschaaf May 7, 2018
ba4491d
Removing support for returning strings from template getter.
kevinpschaaf May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
532 changes: 76 additions & 456 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions lib/mixins/element-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,8 @@ export const ElementMixin = dedupingMixin(base => {
let template = /** @type {PolymerElementConstructor} */ (this).template;
if (template) {
if (typeof template === 'string') {
let t = document.createElement('template');
t.innerHTML = template;
template = t;
console.error('template getter must return HTMLTemplateElement');
template = null;
} else {
template = template.cloneNode(true);
}
Expand Down
6 changes: 3 additions & 3 deletions test/smoke/ordering-test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<body>

<script type="module">
import { PolymerElement } from '../../polymer-element.js';
import { PolymerElement, html } from '../../polymer-element.js';
class XA extends PolymerElement {
static get template() {
return `<x-b prop="[[prop]]"></x-b>`;
return html`<x-b prop="[[prop]]"></x-b>`;
}
static get observers() { return ['propChanged(prop)']}
propChanged() {
Expand Down Expand Up @@ -101,7 +101,7 @@

class XC extends PolymerElement {
static get template() {
return `<div></div>`;
return html`<div></div>`;
}
static get observers() { return ['propChanged(prop)']}
propChanged() {
Expand Down
5 changes: 2 additions & 3 deletions test/unit/dom-repeat-elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Polymer({
}
});
let XNestedRepeat = Polymer({
_template: `
_template: html`
<template id="repeater" is="dom-repeat" items="{{items}}" as="itema" index-as="indexa" on-dom-change="domUpdateHandler">
<x-foo on-test1="testHandler1"
innera-prop="{{innera.prop}}"
Expand Down Expand Up @@ -254,8 +254,7 @@ let XNestedRepeat = Polymer({
class XNestedRepeatMutable extends MutableData(XNestedRepeat) {
static get template() {
if (!this._templateEl) {
this._templateEl = document.createElement('template');
this._templateEl.innerHTML = XNestedRepeat.template;
this._templateEl = XNestedRepeat.template.cloneNode(true);
}
return this.makeRepeatsMutable(this._templateEl.cloneNode(true));
}
Expand Down
6 changes: 3 additions & 3 deletions test/unit/polymer.element.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@

<dom-module id="sub-element">
<script type="module">
import '../../polymer-element.js';
import { PolymerElement } from '../../polymer-element.js';

class SubElement extends window.MyElement {

Expand Down Expand Up @@ -247,11 +247,11 @@
</dom-module>

<script type="module">
import '../../polymer-element.js';
import { html } from '../../polymer-element.js';

class SubNewTemplate extends window.MyElement {
static get template() {
return `
return html`
<h1>Sub template</h1>
<div id="subContent">{{prop2}}</div>`;
}
Expand Down
4 changes: 2 additions & 2 deletions test/unit/styling-scoped.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@
</style>
</template>
<script type="module">
import { PolymerElement } from '../../polymer-element.js';
import { PolymerElement, html } from '../../polymer-element.js';
customElements.define('x-class-no-is', class extends PolymerElement {
static get template() {
return window.xClass;
Expand All @@ -596,7 +596,7 @@

customElements.define('x-template-string', class extends PolymerElement {
static get template() {
return `<style>
return html`<style>
:host {
display: block;
border: 1px solid orange;
Expand Down