[ci skip] release v1.2.1

Polymer · Oct 29, 2015 · be2d57a · be2d57a
1 parent 84d2116
commit be2d57a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "polymer",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": [
     "polymer.html"
   ],

diff --git a/build.log b/build.log
@@ -1,6 +1,6 @@
 BUILD LOG
 ---------
-Build Time: 2015-10-22T17:41:58-0700
+Build Time: 2015-10-29T15:32:35-0700
 
 NODEJS INFORMATION
 ==================
@@ -9,19 +9,19 @@ gulp: 3.9.0
 gulp-audit: 1.0.0
 gulp-rename: 1.2.2
 gulp-vulcanize: 6.0.1
-polyclean: 1.2.0
 lazypipe: 0.2.4
-run-sequence: 1.1.4
+polyclean: 1.2.0
 web-component-tester: 3.3.29
+run-sequence: 1.1.4
 del: 1.2.1
 gulp-replace: 0.5.4
 
 REPO REVISIONS
 ==============
-polymer: ec6b18f3e4ff414e6f3692b6641c7506c910546c
+polymer: 5a755342ef6c1bd404d3b4861c3b82d10d57b2ec
 
 BUILD HASHES
 ============
-polymer-mini.html: d807c77658cac260deb34187c1351be45b414679
-polymer-micro.html: fe27c039dcd2aef07d2b9065ac30a5fd9448d887
-polymer.html: cecea00d47a8682ec01d486a3ac0d45da51eaf24
+polymer-mini.html: 88f650dd1b5691577f998049967a6dc9dc456e48
+polymer-micro.html: 2261be50c3d6dfe7bd1ae9051a1115f409ef64c3
+polymer.html: 0da5e9c32e9ce759647ba6bc64618bb772890acd
diff --git a/polymer-micro.html b/polymer-micro.html
@@ -576,7 +576,7 @@
 }
 }
 });
-Polymer.version = '1.2.0';
+Polymer.version = '1.2.1';
 Polymer.Base._addFeature({
 _registerFeatures: function () {
 this._prepIs();

diff --git a/polymer-mini.html b/polymer-mini.html
@@ -395,6 +395,17 @@
 flush: function () {
 Polymer.dom.flush();
 },
+deepContains: function (node) {
+if (this.node.contains(node)) {
+return true;
+}
+var n = node;
+var wrappedDocument = wrap(document);
+while (n && n !== wrappedDocument && n !== this.node) {
+n = Polymer.dom(n).parentNode || n.host;
+}
+return n === this.node;
+},
 _lazyDistribute: function (host) {
 if (host.shadyRoot && host.shadyRoot._distributionClean) {
 host.shadyRoot._distributionClean = false;

diff --git a/polymer.html b/polymer.html
@@ -1359,7 +1359,7 @@
 return elt;
 },
 isLightDescendant: function (node) {
-return this.contains(node) && Polymer.dom(this).getOwnerRoot() === Polymer.dom(node).getOwnerRoot();
+return this !== node && this.contains(node) && Polymer.dom(this).getOwnerRoot() === Polymer.dom(node).getOwnerRoot();
 },
 isLocalDescendant: function (node) {
 return this.root === Polymer.dom(node).getOwnerRoot();
@@ -1957,7 +1957,7 @@
 Polymer.Base._addFeature({
 notifyPath: function (path, value, fromAbove) {
 var info = {};
-path = this._get(path, this, info);
+this._get(path, this, info);
 this._notifyPath(info.path, value, fromAbove);
 },
 _notifyPath: function (path, value, fromAbove) {
@@ -2074,9 +2074,9 @@
 Polymer.Bind._annotationEffect.call(this, path, value, effect);
 } else if (path.indexOf(effect.value + '.') === 0 && !effect.negate) {
 var node = this._nodes[effect.index];
-if (node && node.notifyPath) {
+if (node && node._notifyPath) {
 var p = this._fixPath(effect.name, effect.value, path);
-node.notifyPath(p, value, true);
+node._notifyPath(p, value, true);
 }
 }
 },
@@ -2116,9 +2116,9 @@
 for (var a in this._boundPaths) {
 var b = this._boundPaths[a];
 if (path.indexOf(a + '.') == 0) {
-this.notifyPath(this._fixPath(b, a, path), value);
+this._notifyPath(this._fixPath(b, a, path), value);
 } else if (path.indexOf(b + '.') == 0) {
-this.notifyPath(this._fixPath(a, b, path), value);
+this._notifyPath(this._fixPath(a, b, path), value);
 }
 }
 },
@@ -2386,7 +2386,7 @@
 comments: /\/\*[^*]*\*+([^\/*][^*]*\*+)*\//gim,
 port: /@import[^;]*;/gim,
 customProp: /(?:^|[\s;])--[^;{]*?:[^{};]*?(?:[;\n]|$)/gim,
-mixinProp: /(?:^|[\s;])--[^;{]*?:[^{;]*?{[^}]*?}(?:[;\n]|$)?/gim,
+mixinProp: /(?:^|[\s;])?--[^;{]*?:[^{;]*?{[^}]*?}(?:[;\n]|$)?/gim,
 mixinApply: /@apply[\s]*\([^)]*?\)[\s]*(?:[;\n]|$)?/gim,
 varApply: /[^;:]*?:[^;]*var[^;]*(?:[;\n]|$)?/gim,
 keyframesRule: /^@[^\s]*keyframes/
@@ -3089,7 +3089,7 @@
 }
 },
 rx: {
-VAR_ASSIGN: /(?:^|[;\n]\s*)(--[\w-]*?):\s*(?:([^;{]*)|{([^}]*)})(?:(?=[;\n])|$)/gi,
+VAR_ASSIGN: /(?:^|[;\s{]\s*)(--[\w-]*?)\s*:\s*(?:([^;{]*)|{([^}]*)})(?:(?=[;\s}])|$)/gi,
 MIXIN_MATCH: /(?:^|\W+)@apply[\s]*\(([^)]*)\)/i,
 VAR_MATCH: /(^|\W+)var\([\s]*([^,)]*)[\s]*,?[\s]*((?:[^,)]*)|(?:[^;]*\([^;)]*\)))[\s]*?\)/gi,
 VAR_CAPTURE: /\([\s]*(--[^,\s)]*)(?:,[\s]*(--[^,\s)]*))?(?:\)|,)/gi,
@@ -3624,9 +3624,12 @@
 if (this._forwardParentPath) {
 if (path.indexOf(this._parentPropPrefix) === 0) {
 var subPath = path.substring(this._parentPropPrefix.length);
+var model = this._modelForPath(subPath);
+if (model in this._parentProps) {
 this._forwardParentPath(subPath, value);
 }
 }
+}
 Polymer.Base._pathEffector.call(this._templatized, path, value, fromAbove);
 },
 _constructorImpl: function (model, host) {