From 898fe890779d033a843f5659a8155053d4713853 Mon Sep 17 00:00:00 2001
From: Filipe Araujo <filipe.alves.araujo@gmail.com>
Date: Tue, 16 Jun 2015 14:05:41 -0400
Subject: [PATCH] parentProps should not override argument based props

---
 src/lib/template/templatizer.html    |  6 +++--
 test/unit/template/dom-template.html | 33 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/lib/template/templatizer.html b/src/lib/template/templatizer.html
index ce7cbfeafd..adcb8c8f46 100644
--- a/src/lib/template/templatizer.html
+++ b/src/lib/template/templatizer.html
@@ -277,7 +277,9 @@
       model = model || {};
       if (this._parentProps) {
         for (var prop in this._parentProps) {
-          model[prop] = this['_parent_' + prop];
+          if (!model[prop]) {
+            model[prop] = this['_parent_' + prop];
+          }
         }
       }
       return new this.ctor(model, this);
@@ -304,4 +306,4 @@
 
   };
 
-</script>
\ No newline at end of file
+</script>
diff --git a/test/unit/template/dom-template.html b/test/unit/template/dom-template.html
index f36ddad403..d045800b7f 100644
--- a/test/unit/template/dom-template.html
+++ b/test/unit/template/dom-template.html
@@ -21,6 +21,34 @@
   <span>{{text}}</span>
 </template>
 
+<dom-module id="test-dom-template">
+  <template>
+    <template is="dom-template" id="tmpl">
+      <span>{{text}}</span>
+    </template>
+  </template>
+  <script>
+    Polymer({
+      is: 'test-dom-template',
+
+      properties: {
+        value: String
+      },
+
+      ready: function() {
+
+        var tmpl = this.$.tmpl.stamp({
+          text: 'ohai'
+        });
+
+        this.value = tmpl.root.textContent.trim();
+      }
+    });
+  </script>
+</dom-module>
+
+<test-dom-template id="testDom"></test-dom-template>
+
 <script>
 
 suite('<dom-template>', function() {
@@ -31,6 +59,11 @@
     assert.equal(row.root.textContent.trim(), 'ohai');
   });
 
+  test('stamps within an element', function() {
+    var template = document.querySelector('#testDom');
+    assert.equal(template.value, 'ohai');
+  });
+
 });
 
 </script>