From 37fd5ffe8e4ac6fc6af1db7db0fd80df75e4d9e6 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Wed, 21 Feb 2018 13:04:06 +0100
Subject: [PATCH 01/16] Add mixin to automatically detect capitalized HTML
 attributes

---
 externs/closure-types.js                      | 17 +++-
 lib/utils/attribute-capitalization-mixin.html | 80 +++++++++++++++++++
 test/unit/attribute-capitalization.html       | 58 ++++++++++++++
 .../utils/attribute-capitalization-mixin.d.ts | 47 +++++++++++
 4 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 lib/utils/attribute-capitalization-mixin.html
 create mode 100644 test/unit/attribute-capitalization.html
 create mode 100644 types/lib/utils/attribute-capitalization-mixin.d.ts

diff --git a/externs/closure-types.js b/externs/closure-types.js
index 0cabb51658..5159c4d1c2 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -1374,4 +1374,19 @@ Polymer_ArraySelectorMixin.prototype.select = function(item){};
 * @param {number} idx Index from `items` array to select
 * @return {void}
 */
-Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
\ No newline at end of file
+Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
+/**
+* @interface
+* @extends {Polymer_PropertyEffects}
+*/
+function Polymer_AttributeCapitalization(){}
+/**
+* @override
+* @param {Node} node Node to parse
+* @param {TemplateInfo} templateInfo Template metadata for current template
+* @param {NodeInfo} nodeInfo Node metadata for current template node
+* @param {*} name 
+* @param {*} value 
+* @return {boolean}
+*/
+Polymer_AttributeCapitalization._parseTemplateNodeAttribute = function(node, templateInfo, nodeInfo, name, value){};
\ No newline at end of file
diff --git a/lib/utils/attribute-capitalization-mixin.html b/lib/utils/attribute-capitalization-mixin.html
new file mode 100644
index 0000000000..d3d856789d
--- /dev/null
+++ b/lib/utils/attribute-capitalization-mixin.html
@@ -0,0 +1,80 @@
+<!--
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+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="boot.html">
+<link rel="import" href="mixin.html">
+<link rel="import" href="../mixins/property-effects.html">
+
+<script>
+(function() {
+
+  'use strict';
+
+  const regex = /[A-Z]/;
+
+  /**
+   * Mixin that uses an heuristic to determine the capitalization of HTML
+   * attributes. By default, all attributes are lowercased. However, some
+   * native attributes have capitalization. `Element.attributes` only returns
+   * capitalized attributes if the attribute name is exactly equal to the attribute.
+   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
+   * an attribute name still has capitaliation, we use an attribute effect to
+   * update the bindings.
+   *
+   * @mixinFunction
+   * @polymer
+   * @appliesMixin Polymer.PropertyEffects
+   * @memberof Polymer
+   * @summary Class mixin that uses an heuristic to determine the capitalization
+   * of HTML attributes.
+   */
+  Polymer.AttributeCapitalization = Polymer.dedupingMixin(superClass => {
+
+    /**
+     * @constructor
+     * @extends {superClass}
+     * @implements {Polymer_PropertyEffects}
+     * @unrestricted
+     */
+    const base = Polymer.PropertyEffects(superClass);
+
+    /**
+     * @polymer
+     * @mixinClass
+     * @implements {Polymer_PropertyEffects}
+     * @extends {propertyEffectsBase}
+     * @unrestricted
+     */
+    class AttributeCapitalization extends base {
+      /**
+       * Overrides default `PropertyEffects` implementation to automatically
+       * detect capitalized attributes.
+       *
+       * @override
+       * @param {Node} node Node to parse
+       * @param {TemplateInfo} templateInfo Template metadata for current template
+       * @param {NodeInfo} nodeInfo Node metadata for current template node
+       * @return {boolean} `true` if the visited node added node-specific
+       *   metadata to `nodeInfo`
+       * @protected
+       * @suppress {missingProperties} Interfaces in closure do not inherit statics, but classes do
+       */
+      static _parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value) {
+        if (regex.test(name)) {
+          node.removeAttribute(name);
+          name = name + '$';
+        }
+        return super._parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value);
+      }
+    }
+
+    return AttributeCapitalization;
+  });
+})();
+</script>
diff --git a/test/unit/attribute-capitalization.html b/test/unit/attribute-capitalization.html
new file mode 100644
index 0000000000..f7927a822f
--- /dev/null
+++ b/test/unit/attribute-capitalization.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+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
+-->
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer.html">
+  <link rel="import" href="../../lib/utils/attribute-capitalization-mixin.html">
+</head>
+<body>
+
+  <dom-module id="svg-element">
+    <template>
+      <svg id="svg" viewBox="[[value]]"></svg>
+    </template>
+    <script>
+      class SVGElement extends Polymer.AttributeCapitalization(Polymer.Element) {
+        static get is() { return 'svg-element'; }
+        static get properties() {
+          return {
+            value: {
+              type: String,
+              value: '0 0 50 50'
+            }
+          };
+        }
+      }
+      customElements.define(SVGElement.is, SVGElement);
+    </script>
+  </dom-module>
+
+<script>
+suite('automated attribute capitalization detection', function() {
+  let el;
+
+  setup(function() {
+    el = document.createElement('svg-element');
+    document.body.appendChild(el);
+  });
+
+  teardown(function() {
+    document.body.removeChild(el);
+  });
+
+  test('can handle capitalized HTML attribute', function() {
+    assert.equal(el.$.svg.getAttribute('viewBox'), el.value);
+  });
+});
+</script>
diff --git a/types/lib/utils/attribute-capitalization-mixin.d.ts b/types/lib/utils/attribute-capitalization-mixin.d.ts
new file mode 100644
index 0000000000..0188ffeb3e
--- /dev/null
+++ b/types/lib/utils/attribute-capitalization-mixin.d.ts
@@ -0,0 +1,47 @@
+/**
+ * DO NOT EDIT
+ *
+ * This file was automatically generated by
+ *   https://github.com/Polymer/gen-typescript-declarations
+ *
+ * To modify these typings, edit the source file(s):
+ *   lib/utils/attribute-capitalization-mixin.html
+ */
+
+/// <reference path="boot.d.ts" />
+/// <reference path="mixin.d.ts" />
+/// <reference path="../mixins/property-effects.d.ts" />
+
+declare namespace Polymer {
+
+
+  /**
+   * Mixin that uses an heuristic to determine the capitalization of HTML
+   * attributes. By default, all attributes are lowercased. However, some
+   * native attributes have capitalization. `Element.attributes` only returns
+   * capitalized attributes if the attribute name is exactly equal to the attribute.
+   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
+   * an attribute name still has capitaliation, we use an attribute effect to
+   * update the bindings.
+   */
+  function AttributeCapitalization<T extends new (...args: any[]) => {}>(base: T): T & AttributeCapitalizationConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor;
+
+  interface AttributeCapitalizationConstructor {
+    new(...args: any[]): AttributeCapitalization;
+
+    /**
+     * Overrides default `PropertyEffects` implementation to automatically
+     * detect capitalized attributes.
+     *
+     * @param node Node to parse
+     * @param templateInfo Template metadata for current template
+     * @param nodeInfo Node metadata for current template node
+     * @returns `true` if the visited node added node-specific
+     *   metadata to `nodeInfo`
+     */
+    _parseTemplateNodeAttribute(node: Node|null, templateInfo: TemplateInfo|null, nodeInfo: NodeInfo|null, name: any, value: any): boolean;
+  }
+
+  interface AttributeCapitalization {
+  }
+}

From d45dd5750c56bf1586e6c0b00ae89ab6015fa08f Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Wed, 28 Feb 2018 13:12:09 +0100
Subject: [PATCH 02/16] Put attribute capitalization fix in property-effects

---
 externs/closure-types.js                      | 17 +---
 lib/mixins/property-effects.html              |  7 +-
 lib/utils/attribute-capitalization-mixin.html | 80 -------------------
 test/unit/attribute-capitalization.html       | 58 --------------
 test/unit/property-effects-elements.html      | 22 +++++
 test/unit/property-effects.html               | 17 ++++
 .../utils/attribute-capitalization-mixin.d.ts | 47 -----------
 7 files changed, 46 insertions(+), 202 deletions(-)
 delete mode 100644 lib/utils/attribute-capitalization-mixin.html
 delete mode 100644 test/unit/attribute-capitalization.html
 delete mode 100644 types/lib/utils/attribute-capitalization-mixin.d.ts

diff --git a/externs/closure-types.js b/externs/closure-types.js
index 5159c4d1c2..0cabb51658 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -1374,19 +1374,4 @@ Polymer_ArraySelectorMixin.prototype.select = function(item){};
 * @param {number} idx Index from `items` array to select
 * @return {void}
 */
-Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
-/**
-* @interface
-* @extends {Polymer_PropertyEffects}
-*/
-function Polymer_AttributeCapitalization(){}
-/**
-* @override
-* @param {Node} node Node to parse
-* @param {TemplateInfo} templateInfo Template metadata for current template
-* @param {NodeInfo} nodeInfo Node metadata for current template node
-* @param {*} name 
-* @param {*} value 
-* @return {boolean}
-*/
-Polymer_AttributeCapitalization._parseTemplateNodeAttribute = function(node, templateInfo, nodeInfo, name, value){};
\ No newline at end of file
+Polymer_ArraySelectorMixin.prototype.selectIndex = function(idx){};
\ No newline at end of file
diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index 2afd52319e..cdcf0ed32a 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -43,6 +43,9 @@
     READ_ONLY: '__readOnly'
   };
 
+  /** @const {string} */
+  const capitalAttributeRegex = /[A-Z]/;
+
   /**
    * @typedef {{
    * name: (string | undefined),
@@ -2530,7 +2533,9 @@
           // Attribute or property
           let origName = name;
           let kind = 'property';
-          if (name[name.length-1] == '$') {
+          if (capitalAttributeRegex.test(name)) {
+            kind = 'attribute';
+          } else if (name[name.length-1] == '$') {
             name = name.slice(0, -1);
             kind = 'attribute';
           }
diff --git a/lib/utils/attribute-capitalization-mixin.html b/lib/utils/attribute-capitalization-mixin.html
deleted file mode 100644
index d3d856789d..0000000000
--- a/lib/utils/attribute-capitalization-mixin.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!--
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-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="boot.html">
-<link rel="import" href="mixin.html">
-<link rel="import" href="../mixins/property-effects.html">
-
-<script>
-(function() {
-
-  'use strict';
-
-  const regex = /[A-Z]/;
-
-  /**
-   * Mixin that uses an heuristic to determine the capitalization of HTML
-   * attributes. By default, all attributes are lowercased. However, some
-   * native attributes have capitalization. `Element.attributes` only returns
-   * capitalized attributes if the attribute name is exactly equal to the attribute.
-   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
-   * an attribute name still has capitaliation, we use an attribute effect to
-   * update the bindings.
-   *
-   * @mixinFunction
-   * @polymer
-   * @appliesMixin Polymer.PropertyEffects
-   * @memberof Polymer
-   * @summary Class mixin that uses an heuristic to determine the capitalization
-   * of HTML attributes.
-   */
-  Polymer.AttributeCapitalization = Polymer.dedupingMixin(superClass => {
-
-    /**
-     * @constructor
-     * @extends {superClass}
-     * @implements {Polymer_PropertyEffects}
-     * @unrestricted
-     */
-    const base = Polymer.PropertyEffects(superClass);
-
-    /**
-     * @polymer
-     * @mixinClass
-     * @implements {Polymer_PropertyEffects}
-     * @extends {propertyEffectsBase}
-     * @unrestricted
-     */
-    class AttributeCapitalization extends base {
-      /**
-       * Overrides default `PropertyEffects` implementation to automatically
-       * detect capitalized attributes.
-       *
-       * @override
-       * @param {Node} node Node to parse
-       * @param {TemplateInfo} templateInfo Template metadata for current template
-       * @param {NodeInfo} nodeInfo Node metadata for current template node
-       * @return {boolean} `true` if the visited node added node-specific
-       *   metadata to `nodeInfo`
-       * @protected
-       * @suppress {missingProperties} Interfaces in closure do not inherit statics, but classes do
-       */
-      static _parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value) {
-        if (regex.test(name)) {
-          node.removeAttribute(name);
-          name = name + '$';
-        }
-        return super._parseTemplateNodeAttribute(node, templateInfo, nodeInfo, name, value);
-      }
-    }
-
-    return AttributeCapitalization;
-  });
-})();
-</script>
diff --git a/test/unit/attribute-capitalization.html b/test/unit/attribute-capitalization.html
deleted file mode 100644
index f7927a822f..0000000000
--- a/test/unit/attribute-capitalization.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!doctype html>
-<!--
-@license
-Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-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
--->
-<html>
-<head>
-  <meta charset="utf-8">
-  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
-  <script src="../../../web-component-tester/browser.js"></script>
-  <link rel="import" href="../../polymer.html">
-  <link rel="import" href="../../lib/utils/attribute-capitalization-mixin.html">
-</head>
-<body>
-
-  <dom-module id="svg-element">
-    <template>
-      <svg id="svg" viewBox="[[value]]"></svg>
-    </template>
-    <script>
-      class SVGElement extends Polymer.AttributeCapitalization(Polymer.Element) {
-        static get is() { return 'svg-element'; }
-        static get properties() {
-          return {
-            value: {
-              type: String,
-              value: '0 0 50 50'
-            }
-          };
-        }
-      }
-      customElements.define(SVGElement.is, SVGElement);
-    </script>
-  </dom-module>
-
-<script>
-suite('automated attribute capitalization detection', function() {
-  let el;
-
-  setup(function() {
-    el = document.createElement('svg-element');
-    document.body.appendChild(el);
-  });
-
-  teardown(function() {
-    document.body.removeChild(el);
-  });
-
-  test('can handle capitalized HTML attribute', function() {
-    assert.equal(el.$.svg.getAttribute('viewBox'), el.value);
-  });
-});
-</script>
diff --git a/test/unit/property-effects-elements.html b/test/unit/property-effects-elements.html
index aeeee70e43..ecfca10c0c 100644
--- a/test/unit/property-effects-elements.html
+++ b/test/unit/property-effects-elements.html
@@ -7,6 +7,8 @@
 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">
+
 <dom-module id="x-basic">
   <template>
     <div id="boundChild"
@@ -1062,3 +1064,23 @@
 }
 customElements.define(SubObserverElement.is, SubObserverElement);
 </script>
+
+<dom-module id="svg-element">
+  <template>
+    <svg id="svg" viewBox="[[value]]"></svg>
+  </template>
+  <script>
+    class SVGElement extends Polymer.Element {
+      static get is() { return 'svg-element'; }
+      static get properties() {
+        return {
+          value: {
+            type: String,
+            value: '0 0 50 50'
+          }
+        };
+      }
+    }
+    customElements.define(SVGElement.is, SVGElement);
+  </script>
+</dom-module>
diff --git a/test/unit/property-effects.html b/test/unit/property-effects.html
index 2a7581fbb5..efe4bf6b34 100644
--- a/test/unit/property-effects.html
+++ b/test/unit/property-effects.html
@@ -419,6 +419,23 @@
       assert.equal(el.__observerCalled, 1);
     });
   });
+
+  suite('automated attribute capitalization detection', function() {
+    let el;
+
+    setup(function() {
+      el = document.createElement('svg-element');
+      document.body.appendChild(el);
+    });
+
+    teardown(function() {
+      document.body.removeChild(el);
+    });
+
+    test('can handle capitalized HTML attribute', function() {
+      assert.equal(el.$.svg.getAttribute('viewBox'), el.value);
+    });
+  });
 });
 
 suite('computed bindings with dynamic functions', function() {
diff --git a/types/lib/utils/attribute-capitalization-mixin.d.ts b/types/lib/utils/attribute-capitalization-mixin.d.ts
deleted file mode 100644
index 0188ffeb3e..0000000000
--- a/types/lib/utils/attribute-capitalization-mixin.d.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * DO NOT EDIT
- *
- * This file was automatically generated by
- *   https://github.com/Polymer/gen-typescript-declarations
- *
- * To modify these typings, edit the source file(s):
- *   lib/utils/attribute-capitalization-mixin.html
- */
-
-/// <reference path="boot.d.ts" />
-/// <reference path="mixin.d.ts" />
-/// <reference path="../mixins/property-effects.d.ts" />
-
-declare namespace Polymer {
-
-
-  /**
-   * Mixin that uses an heuristic to determine the capitalization of HTML
-   * attributes. By default, all attributes are lowercased. However, some
-   * native attributes have capitalization. `Element.attributes` only returns
-   * capitalized attributes if the attribute name is exactly equal to the attribute.
-   * In other words, `viewBox$` will be lowercased to `viewbox$`. Therefore, if
-   * an attribute name still has capitaliation, we use an attribute effect to
-   * update the bindings.
-   */
-  function AttributeCapitalization<T extends new (...args: any[]) => {}>(base: T): T & AttributeCapitalizationConstructor & Polymer.PropertyEffectsConstructor & Polymer.TemplateStampConstructor & Polymer.PropertyAccessorsConstructor & Polymer.PropertiesChangedConstructor;
-
-  interface AttributeCapitalizationConstructor {
-    new(...args: any[]): AttributeCapitalization;
-
-    /**
-     * Overrides default `PropertyEffects` implementation to automatically
-     * detect capitalized attributes.
-     *
-     * @param node Node to parse
-     * @param templateInfo Template metadata for current template
-     * @param nodeInfo Node metadata for current template node
-     * @returns `true` if the visited node added node-specific
-     *   metadata to `nodeInfo`
-     */
-    _parseTemplateNodeAttribute(node: Node|null, templateInfo: TemplateInfo|null, nodeInfo: NodeInfo|null, name: any, value: any): boolean;
-  }
-
-  interface AttributeCapitalization {
-  }
-}

From cb1ae7d30a62abfc9fae1327027ba058bf2be604 Mon Sep 17 00:00:00 2001
From: Westbrook Johnson <westbrook.johnson@gmail.com>
Date: Tue, 6 Mar 2018 22:21:47 -0500
Subject: [PATCH 03/16] Correct the JSBin version

Fixes #5140

This version of the URL matched CONTRIBUTING.md
---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8d68054f92..ffe1bc4655 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -10,7 +10,7 @@ If you are asking a question rather than filing a bug, try one of these instead:
 
 #### Live Demo
 <!-- jsBin starting point (fork and edit) -->
-https://jsbin.com/luhaxab/1/edit
+https://jsbin.com/luhaxab/edit
 <!-- glitch.me starting point (remix and edit -- must be logged in to persist!) -->
 https://glitch.com/edit/#!/polymer-repro?path=my-element.html:2:0
 <!-- ...or provide your own repro URL -->

From 0573d483c4069ff3999f2271fa6ad177cd714f68 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Wed, 7 Mar 2018 12:30:06 +0100
Subject: [PATCH 04/16] [ci skip] Add clarifying comment

---
 lib/mixins/property-effects.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index cdcf0ed32a..2679b593c3 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -2533,6 +2533,9 @@
           // Attribute or property
           let origName = name;
           let kind = 'property';
+          // The only way we see a capital letter here is if the attr has
+          // a capital letter in it per spec. In this case, to make sure
+          // this binding works, we go ahead and make the binding to the attribute.
           if (capitalAttributeRegex.test(name)) {
             kind = 'attribute';
           } else if (name[name.length-1] == '$') {

From 2a6c0a2a10b8d5a4f47a59d7085206d0df406278 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Thu, 15 Mar 2018 11:30:06 +0100
Subject: [PATCH 05/16] Returning null in template should nullify parent
 template

---
 lib/mixins/element-mixin.html |  2 +-
 test/unit/inheritance.html    | 37 ++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/lib/mixins/element-mixin.html b/lib/mixins/element-mixin.html
index 777db15243..d83946cef2 100644
--- a/lib/mixins/element-mixin.html
+++ b/lib/mixins/element-mixin.html
@@ -311,9 +311,9 @@
           } else {
             template = template.cloneNode(true);
           }
-          this.prototype._template = template;
         }
 
+        this.prototype._template = template;
       }
 
       /**
diff --git a/test/unit/inheritance.html b/test/unit/inheritance.html
index 25c8910427..497bed3b08 100644
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -113,6 +113,24 @@
     </script>
   </dom-module>
 
+  <dom-module id="parent-element-template-overriding">
+    <script>
+    HTMLImports.whenReady(function() {
+      class ParentElementWithTemplate extends Polymer.Element {
+        static get template() {
+          return Polymer.html`This template should not exist`;
+        }
+      }
+      class ChildWithNoTemplate extends ParentElementWithTemplate {
+        static get template() {
+          return null;
+        }
+      }
+      customElements.define('child-with-no-template', ChildWithNoTemplate);
+    });
+    </script>
+  </dom-module>
+
   <test-fixture id="basic">
     <template>
       <base-el></base-el>
@@ -237,6 +255,23 @@
       assert.equal(child.handleCustomEvent.callCount, 1);
     });
   });
+
+  suite('child overriding a template', function() {
+    let el;
+
+    setup(function() {
+      el = document.createElement('child-with-no-template');
+      document.body.appendChild(el);
+    });
+
+    teardown(function() {
+      document.body.removeChild(el);
+    });
+
+    test('returning null nullifies the parent template', function() {
+      assert.isNotOk(el.shadowRoot);
+    });
+  });
   </script>
 </body>
-</html>
\ No newline at end of file
+</html>

From b2fb1cfdd839682399f6e9a7410f9af577d5de30 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 15 Mar 2018 10:42:13 -0700
Subject: [PATCH 06/16] use a clearer test for shadowRoot

---
 test/unit/inheritance.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/inheritance.html b/test/unit/inheritance.html
index 497bed3b08..be78f49ca3 100644
--- a/test/unit/inheritance.html
+++ b/test/unit/inheritance.html
@@ -269,7 +269,7 @@
     });
 
     test('returning null nullifies the parent template', function() {
-      assert.isNotOk(el.shadowRoot);
+      assert.equal(el.shadowRoot, null);
     });
   });
   </script>

From acfef71d0fb98351675df9b4cee93ef254ea98d0 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Fri, 16 Mar 2018 16:15:12 +0100
Subject: [PATCH 07/16] Deduplicate style includes

---
 lib/utils/style-gather.html   |  2 +-
 test/unit/styling-scoped.html | 50 +++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/lib/utils/style-gather.html b/lib/utils/style-gather.html
index 5c4fa8ceb6..d4a141e981 100644
--- a/lib/utils/style-gather.html
+++ b/lib/utils/style-gather.html
@@ -123,7 +123,7 @@
           // other dom-modules that contain styling
           let include = e.getAttribute(INCLUDE_ATTR);
           if (include) {
-            styles.push(...this.stylesFromModules(include));
+            styles.push(...new Set(this.stylesFromModules(include)));
           }
           if (baseURI) {
             e.textContent = Polymer.ResolveUrl.resolveCss(e.textContent, baseURI);
diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index aefc3891f7..a6cc007773 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -729,6 +729,37 @@
     </script>
   </dom-module>
 
+  <dom-module id="double-shared-style">
+    <template>
+      <style>
+        .double-shared-style {
+          color: green;
+        }
+      </style>
+    </template>
+  </dom-module>
+
+  <dom-module id="importing-double-shared-style">
+    <template>
+      <style include="double-shared-style">
+      </style>
+    </template>
+  </dom-module>
+
+  <dom-module id="double-shared-styling-element">
+    <template>
+      <style include="importing-double-shared-style double-shared-style"></style>
+    </template>
+    <script>
+    addEventListener('WebComponentsReady', () => {
+      class DoubleSharedStylingElement extends Polymer.Element {
+        static get is() { return 'double-shared-styling-element'; }
+      }
+      customElements.define(DoubleSharedStylingElement.is, DoubleSharedStylingElement);
+    });
+    </script>
+  </dom-module>
+
 <script>
 (function() {
   function assertComputed(element, value, property, pseudo) {
@@ -1012,6 +1043,25 @@
 
   });
 
+  suite('double including style sheets', function() {
+    let el;
+
+    setup(function() {
+      el = document.createElement('double-shared-styling-element');
+      document.body.appendChild(el);
+    });
+
+    teardown(function() {
+      document.body.removeChild(el);
+    });
+
+    test('only includes style modules once', function() {
+      assert.equal(el.shadowRoot.querySelector('style').textContent, `.double-shared-style {
+  color: green;
+}`, 'There should be only one class selector in this style element');
+    });
+  });
+
   if (window.ShadyDOM) {
 
     suite('scoped-styling-shady-only', function() {

From a586b72cee8f35e7330ea4df27b0651283f4a52d Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Fri, 16 Mar 2018 21:36:14 +0100
Subject: [PATCH 08/16] Fix test in shady DOM

---
 test/unit/styling-scoped.html | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index a6cc007773..a6f95f3bdc 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -751,7 +751,7 @@
       <style include="importing-double-shared-style double-shared-style"></style>
     </template>
     <script>
-    addEventListener('WebComponentsReady', () => {
+    HTMLImports.whenReady(() => {
       class DoubleSharedStylingElement extends Polymer.Element {
         static get is() { return 'double-shared-styling-element'; }
       }
@@ -1056,9 +1056,22 @@
     });
 
     test('only includes style modules once', function() {
-      assert.equal(el.shadowRoot.querySelector('style').textContent, `.double-shared-style {
+      const style = el.shadowRoot.querySelector('style');
+
+      // We cant use the regular "does a sub-node have the correct style",
+      // because we are actually need to assert on the actual style content.
+      // In native shadow dom, the style element resides in the shadowRoot,
+      // but in shadyDOM it has moved to the head and the selector has been altered.
+      if (style) {
+        assert.equal(style.textContent, `.double-shared-style {
   color: green;
 }`, 'There should be only one class selector in this style element');
+      } else {
+        assert.equal(document.head.querySelector('[scope="double-shared-styling-element"]').textContent,
+`.double-shared-style.double-shared-styling-element {
+  color: green;
+}`);
+      }
     });
   });
 

From 0d1b1c2e06260b0f96785e21dcf781b6c07ae037 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Fri, 16 Mar 2018 21:37:31 +0100
Subject: [PATCH 09/16] [ci skip] Fix typo

---
 test/unit/styling-scoped.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index a6f95f3bdc..47b63d85e7 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -1059,7 +1059,7 @@
       const style = el.shadowRoot.querySelector('style');
 
       // We cant use the regular "does a sub-node have the correct style",
-      // because we are actually need to assert on the actual style content.
+      // because we actually need to assert on the actual style content.
       // In native shadow dom, the style element resides in the shadowRoot,
       // but in shadyDOM it has moved to the head and the selector has been altered.
       if (style) {

From 33d2e1a8f458e55d169ccf48c6354950a9a5e920 Mon Sep 17 00:00:00 2001
From: Tim van der Lippe <tvanderlippe@gmail.com>
Date: Fri, 16 Mar 2018 23:57:45 +0100
Subject: [PATCH 10/16] Use function instead of Set

---
 lib/utils/style-gather.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/utils/style-gather.html b/lib/utils/style-gather.html
index d4a141e981..3b0a48da6a 100644
--- a/lib/utils/style-gather.html
+++ b/lib/utils/style-gather.html
@@ -123,7 +123,9 @@
           // other dom-modules that contain styling
           let include = e.getAttribute(INCLUDE_ATTR);
           if (include) {
-            styles.push(...new Set(this.stylesFromModules(include)));
+            styles.push(...this.stylesFromModules(include).filter(function(item, index, self) {
+              return self.indexOf(item) === index;
+            }));
           }
           if (baseURI) {
             e.textContent = Polymer.ResolveUrl.resolveCss(e.textContent, baseURI);

From fbbbb19308df2c5e07aa6cc906267879eb8de247 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 22 Mar 2018 12:01:18 -0700
Subject: [PATCH 11/16] 2.6.0

---
 lib/utils/boot.html | 2 +-
 package-lock.json   | 2 +-
 package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/utils/boot.html b/lib/utils/boot.html
index ba85297eb5..0426caa656 100644
--- a/lib/utils/boot.html
+++ b/lib/utils/boot.html
@@ -49,7 +49,7 @@
   };
   /* eslint-enable */
 
-  window.Polymer.version = '2.5.0';
+  window.Polymer.version = '2.6.0';
 
   /* eslint-disable no-unused-vars */
   /*
diff --git a/package-lock.json b/package-lock.json
index 5512cf0f9f..ebb58f4e7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@polymer/polymer",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 354e0f544d..6dd76ec68c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polymer/polymer",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "The Polymer library makes it easy to create your own web components. Give your element some markup and properties, and then use it on a site. Polymer provides features like dynamic templates and data binding to reduce the amount of boilerplate you need to write",
   "main": "polymer.html",
   "directories": {

From 92d282a94bba92a20fb9c976f5d47f3ee66ecbcf Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 22 Mar 2018 12:01:48 -0700
Subject: [PATCH 12/16] [ci skip] update changelog

---
 CHANGELOG.md | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2437a76b0..364ecdcd15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,130 @@
 # Change Log
 
+## [v2.6.0](https://github.com/Polymer/polymer/tree/v2.6.0) (2018-03-22)
+- Use function instead of Set ([commit](https://github.com/Polymer/polymer/commit/33d2e1a8))
+
+- [ci skip] Fix typo ([commit](https://github.com/Polymer/polymer/commit/0d1b1c2e))
+
+- Fix test in shady DOM ([commit](https://github.com/Polymer/polymer/commit/a586b72c))
+
+- Deduplicate style includes ([commit](https://github.com/Polymer/polymer/commit/acfef71d))
+
+- use a clearer test for shadowRoot ([commit](https://github.com/Polymer/polymer/commit/b2fb1cfd))
+
+- Returning null in template should nullify parent template ([commit](https://github.com/Polymer/polymer/commit/2a6c0a2a))
+
+- [ci skip] Add clarifying comment ([commit](https://github.com/Polymer/polymer/commit/0573d483))
+
+- Correct the JSBin version ([commit](https://github.com/Polymer/polymer/commit/cb1ae7d3))
+
+- Put attribute capitalization fix in property-effects ([commit](https://github.com/Polymer/polymer/commit/d45dd575))
+
+- Add note about pre v3 releases ([commit](https://github.com/Polymer/polymer/commit/f9391618))
+
+- Add note for npm package ([commit](https://github.com/Polymer/polymer/commit/8f2cc0d5))
+
+- Add iron-component-page dev-dependency ([commit](https://github.com/Polymer/polymer/commit/d93dd1ce))
+
+- Update several gulp dependencies ([commit](https://github.com/Polymer/polymer/commit/ca57a1f3))
+
+- Update dom5 to 3.0.0 ([commit](https://github.com/Polymer/polymer/commit/d4a0914e))
+
+- Update Google Closure Compiler version and fix cast ([commit](https://github.com/Polymer/polymer/commit/4004c9c4))
+
+- Update types ([commit](https://github.com/Polymer/polymer/commit/bb61a20d))
+
+- Fix several issues in the documentation of dom-* elements ([commit](https://github.com/Polymer/polymer/commit/8e1b3f45))
+
+- Handle `disabled` attribute correctly for tap gesture ([commit](https://github.com/Polymer/polymer/commit/5c0f3e6a))
+
+- add test case for nested label ([commit](https://github.com/Polymer/polymer/commit/c11c99b2))
+
+- Add docs and cleanup matchingLabels ([commit](https://github.com/Polymer/polymer/commit/e1df1662))
+
+- Add tests ([commit](https://github.com/Polymer/polymer/commit/70edf1f8))
+
+- update types ([commit](https://github.com/Polymer/polymer/commit/2d674e75))
+
+- fix tests and add dependency import ([commit](https://github.com/Polymer/polymer/commit/a37ba7e2))
+
+- fix typings ([commit](https://github.com/Polymer/polymer/commit/8f8135b2))
+
+- Ensure DisableUpgradeMixin extends PropertiesMixin ([commit](https://github.com/Polymer/polymer/commit/7e74e363))
+
+- Format comment and remove deduping mixin ([commit](https://github.com/Polymer/polymer/commit/b8c66ded))
+
+- update types ([commit](https://github.com/Polymer/polymer/commit/1fd5f9cf))
+
+- update types ([commit](https://github.com/Polymer/polymer/commit/5bc45ce3))
+
+- Add mixin to automatically detect capitalized HTML attributes ([commit](https://github.com/Polymer/polymer/commit/37fd5ffe))
+
+- Add instructions for locally viewing the source documentation ([commit](https://github.com/Polymer/polymer/commit/206d3610))
+
+- Simplify condition checking in stylesFromModule function ([commit](https://github.com/Polymer/polymer/commit/e6903821))
+
+- Bump type generator and generate new typings. (#5119) ([commit](https://github.com/Polymer/polymer/commit/5c027309))
+
+- dispatchEvent returns boolean (#5117) ([commit](https://github.com/Polymer/polymer/commit/9d86135c))
+
+- Update types ([commit](https://github.com/Polymer/polymer/commit/63e7bbc7))
+
+- Fix license links ([commit](https://github.com/Polymer/polymer/commit/f3939875))
+
+- Fix issue with not genering the Templatizer docs ([commit](https://github.com/Polymer/polymer/commit/55708acf))
+
+- Bump TS type generator to pick up transitive mixin handling. ([commit](https://github.com/Polymer/polymer/commit/c3dad540))
+
+- Remove unnecessary mutableData property from MutableData mixin ([commit](https://github.com/Polymer/polymer/commit/92b83249))
+
+- Update types ([commit](https://github.com/Polymer/polymer/commit/868fba7c))
+
+- Add note to updateStyles regarding updates to CSS mixins ([commit](https://github.com/Polymer/polymer/commit/d458bab3))
+
+- Avoid timing issues with polyfilled Promise ([commit](https://github.com/Polymer/polymer/commit/6b3e007e))
+
+- Revert use of async/await due to lack of build/serve support. ([commit](https://github.com/Polymer/polymer/commit/d4a7a45b))
+
+- Revert types. ([commit](https://github.com/Polymer/polymer/commit/dea90802))
+
+- Update eslint parserOptions to es2017 for async/await support. ([commit](https://github.com/Polymer/polymer/commit/ef579e29))
+
+- Use stronger check for PropertyEffects clients. Fixes #5017 ([commit](https://github.com/Polymer/polymer/commit/e6d558ec))
+
+- Remove unneeded file ([commit](https://github.com/Polymer/polymer/commit/a5393b6d))
+
+- [PropertiesChanged]: allow old data to be gc'd after `_propertiesChanged` ([commit](https://github.com/Polymer/polymer/commit/74907b9a))
+
+- Update package-lock.json ([commit](https://github.com/Polymer/polymer/commit/c58f3e0d))
+
+- Make Travis update-types failure style the same as the elements. ([commit](https://github.com/Polymer/polymer/commit/8189382d))
+
+- Bump TypeScript generator version. ([commit](https://github.com/Polymer/polymer/commit/3e432190))
+
+- Make EventApi.path EventTarget type non-nullable. ([commit](https://github.com/Polymer/polymer/commit/3ede9b51))
+
+- Lint and type fixes ([commit](https://github.com/Polymer/polymer/commit/5607a2d8))
+
+- [PropertiesChanged]: adds _shouldPropertiesChange ([commit](https://github.com/Polymer/polymer/commit/c1885a6a))
+
+- Update docs: templatize() cannot be called multiple times ([commit](https://github.com/Polymer/polymer/commit/27fc21c5))
+
+- [ci skip] update changelog ([commit](https://github.com/Polymer/polymer/commit/65b4df86))
+
+- Update types. ([commit](https://github.com/Polymer/polymer/commit/c3b6236a))
+
+- Fix JSDoc example formatting ([commit](https://github.com/Polymer/polymer/commit/699cd87f))
+
+- Use latest webcomponents polyfill bundle ([commit](https://github.com/Polymer/polymer/commit/8fef6776))
+
+- Fix label tap by checking matched label pairs ([commit](https://github.com/Polymer/polymer/commit/a77d64e5))
+
+- Defer creation related work via `disable-upgrade` ([commit](https://github.com/Polymer/polymer/commit/a7eb9754))
+
+- lint fixes ([commit](https://github.com/Polymer/polymer/commit/de0ac5a2))
+
+- Adds `Polymer.DisableUpgradeMixin` ([commit](https://github.com/Polymer/polymer/commit/62ce3148))
+
 ## [v2.5.0](https://github.com/Polymer/polymer/tree/v2.5.0) (2018-02-02)
 - Update types ([commit](https://github.com/Polymer/polymer/commit/5fa059fa))
 

From e5a5725d6f0efbc90ebd3141e55486e5bb4b0819 Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@gmail.com>
Date: Mon, 26 Mar 2018 18:53:10 -0700
Subject: [PATCH 13/16] Add a @const annotation to help the Closure Compiler
 understand that Polymer.Debouncer is the name of a type.

---
 lib/utils/debounce.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/utils/debounce.html b/lib/utils/debounce.html
index 8344af328f..1507faa20a 100644
--- a/lib/utils/debounce.html
+++ b/lib/utils/debounce.html
@@ -113,6 +113,7 @@
     }
   }
 
+  /** @const */
   Polymer.Debouncer = Debouncer;
 })();
 </script>

From 91d4aebaa616e1c0b1daff233eb07593d05b4661 Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Fri, 30 Mar 2018 15:33:39 -0700
Subject: [PATCH 14/16] Pass through fourth namespace param on
 attributeChangedCallback.

---
 lib/elements/dom-module.html          | 3 ++-
 lib/legacy/legacy-element-mixin.html  | 5 +++--
 lib/mixins/disable-upgrade-mixin.html | 6 +++---
 lib/mixins/properties-changed.html    | 5 +++--
 test/smoke/behavior-mixin.html        | 2 ++
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/elements/dom-module.html b/lib/elements/dom-module.html
index 3ca593b1a9..1ec92aff91 100644
--- a/lib/elements/dom-module.html
+++ b/lib/elements/dom-module.html
@@ -78,9 +78,10 @@
      * @param {string} name Name of attribute.
      * @param {?string} old Old value of attribute.
      * @param {?string} value Current value of attribute.
+     * @param {?string} namespace Attribute namespace.
      * @return {void}
      */
-    attributeChangedCallback(name, old, value) {
+    attributeChangedCallback(name, old, value, namespace) {
       if (old !== value) {
         this.register();
       }
diff --git a/lib/legacy/legacy-element-mixin.html b/lib/legacy/legacy-element-mixin.html
index 7306c65140..6c2045f155 100644
--- a/lib/legacy/legacy-element-mixin.html
+++ b/lib/legacy/legacy-element-mixin.html
@@ -137,12 +137,13 @@
        * @param {string} name Name of attribute.
        * @param {?string} old Old value of attribute.
        * @param {?string} value Current value of attribute.
+       * @param {?string} namespace Attribute namespace.
        * @return {void}
        * @override
        */
-      attributeChangedCallback(name, old, value) {
+      attributeChangedCallback(name, old, value, namespace) {
         if (old !== value) {
-          super.attributeChangedCallback(name, old, value);
+          super.attributeChangedCallback(name, old, value, namespace);
           this.attributeChanged(name, old, value);
         }
       }
diff --git a/lib/mixins/disable-upgrade-mixin.html b/lib/mixins/disable-upgrade-mixin.html
index a94418214e..f714325de5 100644
--- a/lib/mixins/disable-upgrade-mixin.html
+++ b/lib/mixins/disable-upgrade-mixin.html
@@ -60,13 +60,13 @@
       }
 
       /** @override */
-      attributeChangedCallback(name, old, value) {
+      attributeChangedCallback(name, old, value, namespace) {
         if (name == DISABLED_ATTR) {
           if (!this.__dataEnabled && value == null && this.isConnected) {
             super.connectedCallback();
           }
         } else {
-          super.attributeChangedCallback(name, old, value);
+          super.attributeChangedCallback(name, old, value, namespace);
         }
       }
 
@@ -113,4 +113,4 @@
 
 })();
 
-</script>
\ No newline at end of file
+</script>
diff --git a/lib/mixins/properties-changed.html b/lib/mixins/properties-changed.html
index 000c1374af..cfde2854cc 100644
--- a/lib/mixins/properties-changed.html
+++ b/lib/mixins/properties-changed.html
@@ -407,15 +407,16 @@
          * @param {string} name Name of attribute that changed
          * @param {?string} old Old attribute value
          * @param {?string} value New attribute value
+         * @param {?string} namespace Attribute namespace.
          * @return {void}
          * @suppress {missingProperties} Super may or may not implement the callback
          */
-        attributeChangedCallback(name, old, value) {
+        attributeChangedCallback(name, old, value, namespace) {
           if (old !== value) {
             this._attributeToProperty(name, value);
           }
           if (super.attributeChangedCallback) {
-            super.attributeChangedCallback(name, old, value);
+            super.attributeChangedCallback(name, old, value, namespace);
           }
         }
 
diff --git a/test/smoke/behavior-mixin.html b/test/smoke/behavior-mixin.html
index 6c9ed28d7b..b604821080 100644
--- a/test/smoke/behavior-mixin.html
+++ b/test/smoke/behavior-mixin.html
@@ -22,6 +22,7 @@
   </template>
 </dom-module>
 <script>
+  /** @polymerBehavior */
   var MyBehavior = {
     properties: {
       behaviorProp: {
@@ -37,6 +38,7 @@
     }
   }
 
+  /** @polymerBehavior */
   var MyBehavior2 = {
     ready: function() {
       console.log(this.localName, 'MyBehavior2.ready');

From f78b0518954e8087752b05c0fb6d84717708eaad Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Fri, 30 Mar 2018 15:59:53 -0700
Subject: [PATCH 15/16] Lint clean.

---
 lib/elements/dom-module.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/elements/dom-module.html b/lib/elements/dom-module.html
index 1ec92aff91..01aad394c8 100644
--- a/lib/elements/dom-module.html
+++ b/lib/elements/dom-module.html
@@ -74,6 +74,7 @@
       return null;
     }
 
+    /* eslint-disable no-unused-vars */
     /**
      * @param {string} name Name of attribute.
      * @param {?string} old Old value of attribute.
@@ -86,6 +87,7 @@
         this.register();
       }
     }
+    /* eslint-enable no-unused-args */
 
     /**
      * The absolute URL of the original location of this `dom-module`.

From 5357d64aef306add7a24d11cbd313445390885d9 Mon Sep 17 00:00:00 2001
From: Peter Burns <rictic@google.com>
Date: Fri, 30 Mar 2018 15:59:57 -0700
Subject: [PATCH 16/16] Update types.

---
 externs/closure-types.js                    | 8 +++++---
 types/lib/elements/dom-module.d.ts          | 3 ++-
 types/lib/legacy/legacy-element-mixin.d.ts  | 3 ++-
 types/lib/mixins/disable-upgrade-mixin.d.ts | 2 +-
 types/lib/mixins/properties-changed.d.ts    | 3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/externs/closure-types.js b/externs/closure-types.js
index c8b38c77e3..e97a702165 100644
--- a/externs/closure-types.js
+++ b/externs/closure-types.js
@@ -105,9 +105,10 @@ Polymer_PropertiesChanged.prototype._shouldPropertyChange = function(property, v
 * @param {string} name Name of attribute that changed
 * @param {?string} old Old attribute value
 * @param {?string} value New attribute value
+* @param {?string} namespace Attribute namespace.
 * @return {void}
 */
-Polymer_PropertiesChanged.prototype.attributeChangedCallback = function(name, old, value){};
+Polymer_PropertiesChanged.prototype.attributeChangedCallback = function(name, old, value, namespace){};
 /**
 * @param {string} attribute Name of attribute to deserialize.
 * @param {?string} value of the attribute.
@@ -972,9 +973,10 @@ Polymer_LegacyElementMixin.prototype._initializeProperties = function(){};
 * @param {string} name Name of attribute.
 * @param {?string} old Old value of attribute.
 * @param {?string} value Current value of attribute.
+* @param {?string} namespace Attribute namespace.
 * @return {void}
 */
-Polymer_LegacyElementMixin.prototype.attributeChangedCallback = function(name, old, value){};
+Polymer_LegacyElementMixin.prototype.attributeChangedCallback = function(name, old, value, namespace){};
 /**
 * @override
 * @return {void}
@@ -1391,7 +1393,7 @@ Polymer_DisableUpgradeMixin.prototype._enableProperties = function(){};
 /**
 * @override
 */
-Polymer_DisableUpgradeMixin.prototype.attributeChangedCallback = function(name, old, value){};
+Polymer_DisableUpgradeMixin.prototype.attributeChangedCallback = function(name, old, value, namespace){};
 /**
 * @override
 */
diff --git a/types/lib/elements/dom-module.d.ts b/types/lib/elements/dom-module.d.ts
index 7229968d42..e745986b7f 100644
--- a/types/lib/elements/dom-module.d.ts
+++ b/types/lib/elements/dom-module.d.ts
@@ -63,8 +63,9 @@ declare namespace Polymer {
      * @param name Name of attribute.
      * @param old Old value of attribute.
      * @param value Current value of attribute.
+     * @param namespace Attribute namespace.
      */
-    attributeChangedCallback(name: string, old: string|null, value: string|null): void;
+    attributeChangedCallback(name: string, old: string|null, value: string|null, namespace: string|null): void;
 
     /**
      * Registers the dom-module at a given id. This method should only be called
diff --git a/types/lib/legacy/legacy-element-mixin.d.ts b/types/lib/legacy/legacy-element-mixin.d.ts
index cfe9164678..e28fd84f68 100644
--- a/types/lib/legacy/legacy-element-mixin.d.ts
+++ b/types/lib/legacy/legacy-element-mixin.d.ts
@@ -63,8 +63,9 @@ declare namespace Polymer {
      * @param name Name of attribute.
      * @param old Old value of attribute.
      * @param value Current value of attribute.
+     * @param namespace Attribute namespace.
      */
-    attributeChangedCallback(name: string, old: string|null, value: string|null): void;
+    attributeChangedCallback(name: string, old: string|null, value: string|null, namespace: string|null): void;
 
     /**
      * Provides an implementation of `connectedCallback`
diff --git a/types/lib/mixins/disable-upgrade-mixin.d.ts b/types/lib/mixins/disable-upgrade-mixin.d.ts
index f8584219d8..858b4a1e7d 100644
--- a/types/lib/mixins/disable-upgrade-mixin.d.ts
+++ b/types/lib/mixins/disable-upgrade-mixin.d.ts
@@ -42,7 +42,7 @@ declare namespace Polymer {
   interface DisableUpgradeMixin {
     _initializeProperties(): void;
     _enableProperties(): void;
-    attributeChangedCallback(name: any, old: any, value: any): void;
+    attributeChangedCallback(name: any, old: any, value: any, namespace: any): void;
     connectedCallback(): void;
     disconnectedCallback(): void;
   }
diff --git a/types/lib/mixins/properties-changed.d.ts b/types/lib/mixins/properties-changed.d.ts
index 13364e1980..0c074275bd 100644
--- a/types/lib/mixins/properties-changed.d.ts
+++ b/types/lib/mixins/properties-changed.d.ts
@@ -235,8 +235,9 @@ declare namespace Polymer {
      * @param name Name of attribute that changed
      * @param old Old attribute value
      * @param value New attribute value
+     * @param namespace Attribute namespace.
      */
-    attributeChangedCallback(name: string, old: string|null, value: string|null): void;
+    attributeChangedCallback(name: string, old: string|null, value: string|null, namespace: string|null): void;
 
     /**
      * Deserializes an attribute to its associated property.