Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js

Issue 2158913007: Roll Polymer from 1.5.0 -> 1.6.0 to pick up native CSS custom props (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js
index daf1bc7331bd06321209159b8e5c521d3db86015..af836e3b6de879af0091ad7a203df398323624e2 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-collapse/iron-collapse-extracted.js
@@ -49,7 +49,7 @@ Polymer({
/**
* `maxWidth` or `maxHeight`.
* @private
- */
+ */
get _dimensionMax() {
return this.horizontal ? 'maxWidth' : 'maxHeight';
},
@@ -98,7 +98,7 @@ Polymer({
* Updates the size of the element.
* @param {string} size The new value for `maxWidth`/`maxHeight` as css property value, usually `auto` or `0px`.
* @param {boolean=} animated if `true` updates the size with an animation, otherwise without.
- */
+ */
updateSize: function(size, animated) {
// No change!
var curSize = this.style[this._dimensionMax];
@@ -119,9 +119,9 @@ Polymer({
}
// Go to startSize without animation.
this.style[this._dimensionMax] = startSize;
- // Force layout to ensure transition will go. Set offsetHeight to itself
+ // Force layout to ensure transition will go. Set scrollTop to itself
// so that compilers won't remove it.
- this.offsetHeight = this.offsetHeight;
+ this.scrollTop = this.scrollTop;
// Enable animation.
this._updateTransition(true);
}

Powered by Google App Engine
This is Rietveld 408576698