diff --git a/src/lib/template/templatizer.html b/src/lib/template/templatizer.html index b76fcc46..a6cdf5bf 100644 --- a/src/lib/template/templatizer.html +++ b/src/lib/template/templatizer.html @@ -416,7 +416,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN if (this._parentProps) { var templatized = this._templatized; for (var prop in this._parentProps) { - model[prop] = templatized[this._parentPropPrefix + prop]; + if (model[prop] === undefined) { + model[prop] = templatized[this._parentPropPrefix + prop]; + } } } return new this.ctor(model, this); diff --git a/test/runner.html b/test/runner.html index 8acdc9b9..22b6bb82 100644 --- a/test/runner.html +++ b/test/runner.html @@ -66,6 +66,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN 'unit/templatizer.html', 'unit/dom-repeat.html', 'unit/dom-if.html', + 'unit/dom-template.html', 'unit/dom-bind.html', 'unit/script-after-import-in-head.html', 'unit/globals.html' diff --git a/test/unit/template/dom-template.html b/test/unit/dom-template.html similarity index 50% rename from test/unit/template/dom-template.html rename to test/unit/dom-template.html index f36ddad4..36556a2f 100644 --- a/test/unit/template/dom-template.html +++ b/test/unit/dom-template.html @@ -11,9 +11,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN - - - + + + @@ -21,6 +21,38 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN {{text}} + + + + + + +