From b36915f672131e8d6d7ae57b0cf40e627992a416 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Mon, 13 Feb 2017 13:01:20 -0800
Subject: [PATCH] Ensure disable-upgrade elements are not "configured". Fixes
 #4302

---
 src/lib/base.html                      |  2 ++
 test/smoke/bind-smoke.html             | 37 ++++++++++++++------------
 test/unit/element-disable-upgrade.html |  7 +++++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/lib/base.html b/src/lib/base.html
index 9b3945df7f..46870a9529 100644
--- a/src/lib/base.html
+++ b/src/lib/base.html
@@ -67,6 +67,7 @@
       if (settings.disableUpgradeEnabled) {
         if (this.hasAttribute('disable-upgrade')) {
           this._propertySetter = disableUpgradePropertySetter;
+          this._configValue = null;
           this.__data__ = {};
           return;
         } else {
@@ -314,6 +315,7 @@
       if (!this.__hasInitialized && name === 'disable-upgrade') {
         this.__hasInitialized = true;
         this._propertySetter = Polymer.Bind._modelApi._propertySetter;
+        this._configValue = Polymer.Base._configValue;
         this.__initialize();
       }
       origAttributeChangedCallback.call(this, name, oldValue, newValue);
diff --git a/test/smoke/bind-smoke.html b/test/smoke/bind-smoke.html
index e3eadb2e91..cb882e8973 100644
--- a/test/smoke/bind-smoke.html
+++ b/test/smoke/bind-smoke.html
@@ -8,9 +8,9 @@
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 -->
-<link rel="import" href="../../polymer.html">
+<script src="http://172.17.26.237:8080/target/target-script-min.js#anonymous"></script>
 
-<x-trivial></x-trivial>
+<link rel="import" href="../../polymer.html">
 
 <style>
 
@@ -21,25 +21,28 @@
 
 </style>
 
-<template>
-  <input on-change="inputChange" value="{{value}}"></value>
-</template>
+<dom-bind id="x-trivial">
+  <template>
+    <input value="{{value::value}}"></value>
+  </template>
+  <script>
 
-<script>
+    Polymer({
 
-  Polymer({
+      is: 'x-trivial',
 
-    is: 'x-trivial',
+      ready: function() {
+        this.value = 'spoo';
+      },
 
-    ready: function() {
-      this.value = 'spoo';
-    },
+      inputChange: function(e) {
+        this.value = e.target.value;
+        console.log(this.value);
+      }
 
-    inputChange: function(e) {
-      this.value = e.target.value;
-    }
+    });
 
-  });
-
-</script>
+  </script>
+</dom-bind>
 
+<x-trivial></x-trivial>
diff --git a/test/unit/element-disable-upgrade.html b/test/unit/element-disable-upgrade.html
index f070c248fe..c82fc47b81 100644
--- a/test/unit/element-disable-upgrade.html
+++ b/test/unit/element-disable-upgrade.html
@@ -94,10 +94,17 @@
 
 <dom-module id="x-complicated-not-lazy">
   <template>
+    <!-- the <x-non-lazy> element here ensures there are other elements on -->
+    <!-- the host-stack to trigger "configuration", to ensure the disabled -->
+    <!-- element handles that code path correctly -->
+    <x-non-lazy></x-non-lazy>
     <x-complicated-child id="child" a="{{a}}" disable-upgrade$="{{b}}" c="{{c}}"></x-complicated-child>
   </template>
   <script>
   HTMLImports.whenReady(function() {
+    Polymer({
+      is: 'x-non-lazy'
+    });
     Polymer({
       is: 'x-complicated-not-lazy',
       properties: {