From 16e9d56b6cc950d0ebd4c2313397f80b0932afe5 Mon Sep 17 00:00:00 2001
From: Daniel Freedman <dfreedm@google.com>
Date: Thu, 28 Jul 2016 18:09:19 -0700
Subject: [PATCH] 1.6.1-rc1

---
 polymer-micro.html |  41 +++++---
 polymer-mini.html  |   4 +-
 polymer.html       | 232 +++++++++++++++++++++++++++++++++++----------
 3 files changed, 211 insertions(+), 66 deletions(-)

diff --git a/polymer-micro.html b/polymer-micro.html
index 2445d3fb90..956a1e372b 100644
--- a/polymer-micro.html
+++ b/polymer-micro.html
@@ -6,7 +6,11 @@
 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
---><script>(function () {
+-->
+
+
+
+<script>(function () {
 function resolve() {
 document.body.removeAttribute('unresolved');
 }
@@ -22,11 +26,13 @@
 }());window.Polymer = {
 Settings: function () {
 var settings = window.Polymer || {};
+if (!settings.noUrlSettings) {
 var parts = location.search.slice(1).split('&');
 for (var i = 0, o; i < parts.length && (o = parts[i]); i++) {
 o = o.split('=');
 o[0] && (settings[o[0]] = o[1] || true);
 }
+}
 settings.wantShadow = settings.dom === 'shadow';
 settings.hasShadow = Boolean(Element.prototype.createShadowRoot);
 settings.nativeShadow = settings.hasShadow && !window.ShadowDOMPolyfill;
@@ -173,8 +179,14 @@
 this.extend(this, feature);
 },
 registerCallback: function () {
+if (settings.lazyRegister === 'max') {
+if (this.beforeRegister) {
+this.beforeRegister();
+}
+} else {
 this._desugarBehaviors();
 this._doBehavior('beforeRegister');
+}
 this._registerFeatures();
 if (!settings.lazyRegister) {
 this.ensureRegisterFinished();
@@ -193,7 +205,11 @@
 this._ensureRegisterFinished(this);
 },
 _ensureRegisterFinished: function (proto) {
-if (proto.__hasRegisterFinished !== proto.is) {
+if (proto.__hasRegisterFinished !== proto.is || !proto.is) {
+if (settings.lazyRegister === 'max') {
+proto._desugarBehaviors();
+proto._doBehaviorOnly('beforeRegister');
+}
 proto.__hasRegisterFinished = proto.is;
 if (proto._finishRegisterFeatures) {
 proto._finishRegisterFeatures();
@@ -229,14 +245,14 @@
 _attributeChangedImpl: function (name) {
 this._setAttributeToProperty(this, name);
 },
-extend: function (prototype, api) {
-if (prototype && api) {
-var n$ = Object.getOwnPropertyNames(api);
+extend: function (target, source) {
+if (target && source) {
+var n$ = Object.getOwnPropertyNames(source);
 for (var i = 0, n; i < n$.length && (n = n$[i]); i++) {
-this.copyOwnProperty(n, api, prototype);
+this.copyOwnProperty(n, source, target);
 }
 }
-return prototype || api;
+return target || source;
 },
 mixin: function (target, source) {
 for (var i in source) {
@@ -428,6 +444,11 @@
 }
 this._invokeBehavior(this, name, args);
 },
+_doBehaviorOnly: function (name, args) {
+for (var i = 0; i < this.behaviors.length; i++) {
+this._invokeBehavior(this.behaviors[i], name, args);
+}
+},
 _invokeBehavior: function (b, name, args) {
 var fn = b[name];
 if (fn) {
@@ -679,7 +700,7 @@
 return value != null ? value : undefined;
 }
 }
-});Polymer.version = '1.6.0';Polymer.Base._addFeature({
+});Polymer.version = "1.6.0";Polymer.Base._addFeature({
 _registerFeatures: function () {
 this._prepIs();
 this._prepBehaviors();
@@ -709,7 +730,3 @@
 
 
 
-
-
-
-
diff --git a/polymer-mini.html b/polymer-mini.html
index f6dd537e81..86965a5549 100644
--- a/polymer-mini.html
+++ b/polymer-mini.html
@@ -8,6 +8,8 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 --><link rel="import" href="polymer-micro.html">
 
+
+
 <script>Polymer.Base._addFeature({
 _prepTemplate: function () {
 if (this._template === undefined) {
@@ -2160,5 +2162,3 @@
 
 
 
-
-
diff --git a/polymer.html b/polymer.html
index 3e158701bb..6d88c37fbd 100644
--- a/polymer.html
+++ b/polymer.html
@@ -16,6 +16,8 @@
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 --><link rel="import" href="polymer-mini.html">
 
+
+
 <script>Polymer.nar = [];
 Polymer.Annotations = {
 parseAnnotations: function (template) {
@@ -567,6 +569,10 @@
 }();
 var IS_TOUCH_ONLY = navigator.userAgent.match(/iP(?:[oa]d|hone)|Android/);
 var mouseCanceller = function (mouseEvent) {
+var sc = mouseEvent.sourceCapabilities;
+if (sc && !sc.firesTouchEvents) {
+return;
+}
 mouseEvent[HANDLED_OBJ] = { skip: true };
 if (mouseEvent.type === 'click') {
 var path = Polymer.dom(mouseEvent).path;
@@ -1433,7 +1439,7 @@
 var effects = node._propertyEffects && node._propertyEffects[property];
 if (effects) {
 node._propertySetter(property, value, effects, quiet);
-} else {
+} else if (node[property] !== value) {
 node[property] = value;
 }
 },
@@ -1910,9 +1916,6 @@
 var node = this._nodes[info.index];
 var property = info.name;
 value = this._computeFinalAnnotationValue(node, property, value, info);
-if (info.customEvent && node[property] === value) {
-return;
-}
 if (info.kind == 'attribute') {
 this.serializeValueToAttribute(value, property, node);
 } else {
@@ -1980,6 +1983,7 @@
 },
 _configure: function () {
 this._configureAnnotationReferences();
+this._configureInstanceProperties();
 this._aboveConfig = this.mixin({}, this._config);
 var config = {};
 for (var i = 0; i < this.behaviors.length; i++) {
@@ -1992,13 +1996,18 @@
 this._distributeConfig(this._config);
 }
 },
+_configureInstanceProperties: function () {
+for (var i in this._propertyEffects) {
+if (!usePolyfillProto && this.hasOwnProperty(i)) {
+this._configValue(i, this[i]);
+delete this[i];
+}
+}
+},
 _configureProperties: function (properties, config) {
 for (var i in properties) {
 var c = properties[i];
-if (!usePolyfillProto && this.hasOwnProperty(i) && this._propertyEffects && this._propertyEffects[i]) {
-config[i] = this[i];
-delete this[i];
-} else if (c.value !== undefined) {
+if (c.value !== undefined) {
 var value = c.value;
 if (typeof value == 'function') {
 value = value.call(this, this._config);
@@ -2699,10 +2708,42 @@
 getCssBuildType: function (element) {
 return element.getAttribute('css-build');
 },
+_findMatchingParen: function (text, start) {
+var level = 0;
+for (var i = start, l = text.length; i < l; i++) {
+switch (text[i]) {
+case '(':
+level++;
+break;
+case ')':
+if (--level === 0) {
+return i;
+}
+break;
+}
+}
+return -1;
+},
+processVariableAndFallback: function (str, callback) {
+var start = str.indexOf('var(');
+if (start === -1) {
+return callback(str, '', '', '');
+}
+var end = this._findMatchingParen(str, start + 3);
+var inner = str.substring(start + 4, end);
+var prefix = str.substring(0, start);
+var suffix = this.processVariableAndFallback(str.substring(end + 1), callback);
+var comma = inner.indexOf(',');
+if (comma === -1) {
+return callback(prefix, inner.trim(), '', suffix);
+}
+var value = inner.substring(0, comma).trim();
+var fallback = inner.substring(comma + 1).trim();
+return callback(prefix, value, fallback, suffix);
+},
 rx: {
 VAR_ASSIGN: /(?:^|[;\s{]\s*)(--[\w-]*?)\s*:\s*(?:([^;{]*)|{([^}]*)})(?:(?=[;\s}])|$)/gi,
 MIXIN_MATCH: /(?:^|\W+)@apply\s*\(?([^);\n]*)\)?/gi,
-VAR_MATCH: /(^|\W+)var\([\s]*([^,)]*)[\s]*,?[\s]*((?:[^,()]*)|(?:[^;()]*\([^;)]*\)+))[\s]*?\)/gi,
 VAR_CONSUMED: /(--[\w-]+)\s*([:,;)]|$)/gi,
 ANIMATION_MATCH: /(animation\s*:)|(animation-name\s*:)/,
 MEDIA_MATCH: /@media[^(]*(\([^)]*\))/,
@@ -2997,42 +3038,66 @@
 var styleUtil = Polymer.StyleUtil;
 var MIXIN_MATCH = styleUtil.rx.MIXIN_MATCH;
 var VAR_ASSIGN = styleUtil.rx.VAR_ASSIGN;
-var VAR_MATCH = styleUtil.rx.VAR_MATCH;
+var BAD_VAR = /var\(\s*(--[^,]*),\s*(--[^)]*)\)/g;
 var APPLY_NAME_CLEAN = /;\s*/m;
+var INITIAL_INHERIT = /^\s*(initial)|(inherit)\s*$/;
 var MIXIN_VAR_SEP = '_-_';
 var mixinMap = {};
-function mapSet(name, prop) {
+function mapSet(name, props) {
 name = name.trim();
-mixinMap[name] = prop;
+mixinMap[name] = {
+properties: props,
+dependants: {}
+};
 }
 function mapGet(name) {
 name = name.trim();
 return mixinMap[name];
 }
+function replaceInitialOrInherit(property, value) {
+var match = INITIAL_INHERIT.exec(value);
+if (match) {
+if (match[1]) {
+value = ApplyShim._getInitialValueForProperty(property);
+} else {
+value = 'apply-shim-inherit';
+}
+}
+return value;
+}
 function cssTextToMap(text) {
 var props = text.split(';');
+var property, value;
 var out = {};
 for (var i = 0, p, sp; i < props.length; i++) {
 p = props[i];
 if (p) {
 sp = p.split(':');
 if (sp.length > 1) {
-out[sp[0].trim()] = sp.slice(1).join(':');
+property = sp[0].trim();
+value = replaceInitialOrInherit(property, sp.slice(1).join(':'));
+out[property] = value;
 }
 }
 }
 return out;
 }
+function invalidateMixinEntry(mixinEntry) {
+var currentProto = ApplyShim.__currentElementProto;
+var currentElementName = currentProto && currentProto.is;
+for (var elementName in mixinEntry.dependants) {
+if (elementName !== currentElementName) {
+mixinEntry.dependants[elementName].__applyShimInvalid = true;
+}
+}
+}
 function produceCssProperties(matchText, propertyName, valueProperty, valueMixin) {
 if (valueProperty) {
-VAR_MATCH.lastIndex = 0;
-var m = VAR_MATCH.exec(valueProperty);
-if (m) {
-var value = m[2];
-if (mapGet(value)) {
+styleUtil.processVariableAndFallback(valueProperty, function (prefix, value) {
+if (value && mapGet(value)) {
 valueMixin = '@apply ' + value + ';';
 }
-}
+});
 }
 if (!valueMixin) {
 return matchText;
@@ -3040,44 +3105,57 @@
 var mixinAsProperties = consumeCssProperties(valueMixin);
 var prefix = matchText.slice(0, matchText.indexOf('--'));
 var mixinValues = cssTextToMap(mixinAsProperties);
-var oldProperties = mapGet(propertyName);
 var combinedProps = mixinValues;
-if (oldProperties) {
-combinedProps = Polymer.Base.mixin(oldProperties, mixinValues);
+var mixinEntry = mapGet(propertyName);
+var oldProps = mixinEntry && mixinEntry.properties;
+if (oldProps) {
+combinedProps = Object.create(oldProps);
+combinedProps = Polymer.Base.mixin(combinedProps, mixinValues);
 } else {
 mapSet(propertyName, combinedProps);
 }
 var out = [];
 var p, v;
+var needToInvalidate = false;
 for (p in combinedProps) {
 v = mixinValues[p];
 if (v === undefined) {
 v = 'initial';
 }
+if (oldProps && !(p in oldProps)) {
+needToInvalidate = true;
+}
 out.push(propertyName + MIXIN_VAR_SEP + p + ': ' + v);
 }
-return prefix + out.join('; ') + ';';
+if (needToInvalidate) {
+invalidateMixinEntry(mixinEntry);
 }
-function fixVars(matchText, prefix, value, fallback) {
-if (!fallback || fallback.indexOf('--') !== 0) {
-return matchText;
+if (mixinEntry) {
+mixinEntry.properties = combinedProps;
 }
-return [
-prefix,
-'var(',
-value,
-', var(',
-fallback,
-'));'
-].join('');
+if (valueProperty) {
+prefix = matchText + ';' + prefix;
+}
+return prefix + out.join('; ') + ';';
+}
+function fixVars(matchText, varA, varB) {
+return 'var(' + varA + ',' + 'var(' + varB + '));';
 }
 function atApplyToCssProperties(mixinName, fallbacks) {
 mixinName = mixinName.replace(APPLY_NAME_CLEAN, '');
 var vars = [];
-var mixinProperties = mapGet(mixinName);
-if (mixinProperties) {
+var mixinEntry = mapGet(mixinName);
+if (!mixinEntry) {
+mapSet(mixinName, {});
+mixinEntry = mapGet(mixinName);
+}
+if (mixinEntry) {
+var currentProto = ApplyShim.__currentElementProto;
+if (currentProto) {
+mixinEntry.dependants[currentProto.is] = currentProto;
+}
 var p, parts, f;
-for (p in mixinProperties) {
+for (p in mixinEntry.properties) {
 f = fallbacks && fallbacks[p];
 parts = [
 p,
@@ -3117,10 +3195,14 @@
 return text;
 }
 var ApplyShim = {
+_measureElement: null,
 _map: mixinMap,
 _separator: MIXIN_VAR_SEP,
-transform: function (styles) {
+transform: function (styles, elementProto) {
+this.__currentElementProto = elementProto;
 styleUtil.forRulesInStyles(styles, this._boundTransformRule);
+elementProto.__applyShimInvalid = false;
+this.__currentElementProto = null;
 },
 transformRule: function (rule) {
 rule.cssText = this.transformCssText(rule.parsedCssText);
@@ -3129,9 +3211,17 @@
 }
 },
 transformCssText: function (cssText) {
-cssText = cssText.replace(VAR_MATCH, fixVars);
+cssText = cssText.replace(BAD_VAR, fixVars);
 cssText = cssText.replace(VAR_ASSIGN, produceCssProperties);
 return consumeCssProperties(cssText);
+},
+_getInitialValueForProperty: function (property) {
+if (!this._measureElement) {
+this._measureElement = document.createElement('meta');
+this._measureElement.style.all = 'initial';
+document.head.appendChild(this._measureElement);
+}
+return window.getComputedStyle(this._measureElement).getPropertyValue(property);
 }
 };
 ApplyShim._boundTransformRule = ApplyShim.transformRule.bind(ApplyShim);
@@ -3168,7 +3258,7 @@
 }
 this._styles = this._styles || this._collectStyles();
 if (settings.useNativeCSSProperties && !this.__cssBuild) {
-applyShim.transform(this._styles);
+applyShim.transform(this._styles, this);
 }
 var cssText = settings.useNativeCSSProperties && hasTargetedCssBuild ? this._styles.length && this._styles[0].textContent.trim() : styleTransformer.elementStyles(this);
 this._prepStyleProperties();
@@ -3256,6 +3346,7 @@
 var matchesSelector = Polymer.DomApi.matchesSelector;
 var styleUtil = Polymer.StyleUtil;
 var styleTransformer = Polymer.StyleTransformer;
+var IS_IE = navigator.userAgent.match('Trident');
 var settings = Polymer.Settings;
 return {
 decorateStyles: function (styles, scope) {
@@ -3310,9 +3401,13 @@
 } else {
 var m, rx = this.rx.VAR_ASSIGN;
 var cssText = rule.parsedCssText;
+var value;
 var any;
 while (m = rx.exec(cssText)) {
-properties[m[1].trim()] = (m[2] || m[3]).trim();
+value = (m[2] || m[3]).trim();
+if (value !== 'inherit') {
+properties[m[1].trim()] = value;
+}
 any = true;
 }
 return any;
@@ -3346,11 +3441,14 @@
 property = this.valueForProperties(property, props);
 } else {
 var self = this;
-var fn = function (all, prefix, value, fallback) {
-var propertyValue = self.valueForProperty(props[value], props) || self.valueForProperty(props[fallback] || fallback, props) || fallback;
-return prefix + (propertyValue || '');
+var fn = function (prefix, value, fallback, suffix) {
+var propertyValue = self.valueForProperty(props[value], props);
+if (!propertyValue || propertyValue === 'initial') {
+propertyValue = self.valueForProperty(props[fallback] || fallback, props) || fallback;
+}
+return prefix + (propertyValue || '') + suffix;
 };
-property = property.replace(this.rx.VAR_MATCH, fn);
+property = styleUtil.processVariableAndFallback(property, fn);
 }
 }
 return property && property.trim() || '';
@@ -3448,7 +3546,7 @@
 var isHost = parsedSelector.indexOf(':host') === 0;
 var cssBuild = scope.__cssBuild || style.__cssBuild;
 if (cssBuild === 'shady') {
-isRoot = parsedSelector === hostScope + '> *.' + hostScope || parsedSelector.indexOf('html') !== -1;
+isRoot = parsedSelector === hostScope + ' > *.' + hostScope || parsedSelector.indexOf('html') !== -1;
 isHost = !isRoot && parsedSelector.indexOf(hostScope) === 0;
 }
 if (cssBuild === 'shadow') {
@@ -3463,7 +3561,7 @@
 if (settings.useNativeShadow && !rule.transformedSelector) {
 rule.transformedSelector = styleTransformer._transformRuleCss(rule, styleTransformer._transformComplexSelector, scope.is, hostScope);
 }
-selectorToMatch = rule.transformedSelector || hostScope;
+selectorToMatch = rule.transformedSelector || rule.parsedSelector;
 }
 callback({
 selector: selectorToMatch,
@@ -3579,6 +3677,9 @@
 }
 element._customStyle = style;
 }
+if (IS_IE) {
+style.textContent = style.textContent;
+}
 return style;
 },
 mixinCustomStyle: function (props, customStyle) {
@@ -3591,14 +3692,20 @@
 }
 },
 updateNativeStyleProperties: function (element, properties) {
-for (var i = 0; i < element.style.length; i++) {
-element.style.removeProperty(element.style[i]);
+var oldPropertyNames = element.__customStyleProperties;
+if (oldPropertyNames) {
+for (var i = 0; i < oldPropertyNames.length; i++) {
+element.style.removeProperty(oldPropertyNames[i]);
 }
+}
+var propertyNames = [];
 for (var p in properties) {
 if (properties[p] !== null) {
 element.style.setProperty(p, properties[p]);
+propertyNames.push(p);
 }
 }
+element.__customStyleProperties = propertyNames;
 },
 rx: styleUtil.rx,
 XSCOPE_NAME: 'x-scope'
@@ -3732,6 +3839,23 @@
 _needsStyleProperties: function () {
 return Boolean(!nativeVariables && this._ownStylePropertyNames && this._ownStylePropertyNames.length);
 },
+_validateApplyShim: function () {
+if (this.__applyShimInvalid) {
+Polymer.ApplyShim.transform(this._styles, this.__proto__);
+var cssText = styleTransformer.elementStyles(this);
+if (nativeShadow) {
+var templateStyle = this._template.content.querySelector('style');
+if (templateStyle) {
+templateStyle.textContent = cssText;
+}
+} else {
+var shadyStyle = this._scopeStyle && this._scopeStyle.nextSibling;
+if (shadyStyle) {
+shadyStyle.textContent = cssText;
+}
+}
+}
+},
 _beforeAttached: function () {
 if ((!this._scopeSelector || this.__stylePropertiesInvalid) && this._needsStyleProperties()) {
 this.__stylePropertiesInvalid = false;
@@ -3750,6 +3874,9 @@
 },
 _updateStyleProperties: function () {
 var info, scope = this._findStyleHost();
+if (!scope._styleProperties) {
+scope._computeStyleProperties();
+}
 if (!scope._styleCache) {
 scope._styleCache = new Polymer.StyleCache();
 }
@@ -3909,6 +4036,7 @@
 this._setupShady();
 this._registerHost();
 if (this._template) {
+this._validateApplyShim();
 this._poolContent();
 this._beginHosting();
 this._stampTemplate();
@@ -5101,7 +5229,7 @@
 },
 _forwardParentProp: function (prop, value) {
 if (this._instance) {
-this._instance[prop] = value;
+this._instance.__setProperty(prop, value, true);
 }
 },
 _forwardParentPath: function (path, value) {
@@ -5157,6 +5285,8 @@
 return selector;
 }
 },
+_configureInstanceProperties: function () {
+},
 _prepConfigure: function () {
 var config = {};
 for (var prop in this._propertyEffects) {
@@ -5219,8 +5349,6 @@
 
 
 
-
-