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

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

Issue 1984963002: Roll Polymer elements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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-dropdown/iron-dropdown-extracted.js
diff --git a/third_party/polymer/v1_0/components-chromium/iron-dropdown/iron-dropdown-extracted.js b/third_party/polymer/v1_0/components-chromium/iron-dropdown/iron-dropdown-extracted.js
index 2c42d8443ba0d213b81ac202b4d3fb5aa9854b0c..9e55e8ef9d2356f0ce10410b2929efa89e301106 100644
--- a/third_party/polymer/v1_0/components-chromium/iron-dropdown/iron-dropdown-extracted.js
+++ b/third_party/polymer/v1_0/components-chromium/iron-dropdown/iron-dropdown-extracted.js
@@ -102,6 +102,11 @@
return this.focusTarget || this.containedElement;
},
+ detached: function() {
+ this.cancelAnimation();
+ Polymer.IronDropdownScrollManager.removeScrollLock(this);
+ },
+
/**
* Called when the value of `opened` changes.
* Overridden from `IronOverlayBehavior`
@@ -126,10 +131,7 @@
* Overridden from `IronOverlayBehavior`.
*/
_renderOpened: function() {
- if (!this.noAnimations && this.animationConfig && this.animationConfig.open) {
- if (this.withBackdrop) {
- this.backdropElement.open();
- }
+ if (!this.noAnimations && this.animationConfig.open) {
this.$.contentWrapper.classList.add('animating');
this.playAnimation('open');
} else {
@@ -141,10 +143,7 @@
* Overridden from `IronOverlayBehavior`.
*/
_renderClosed: function() {
- if (!this.noAnimations && this.animationConfig && this.animationConfig.close) {
- if (this.withBackdrop) {
- this.backdropElement.close();
- }
+ if (!this.noAnimations && this.animationConfig.close) {
this.$.contentWrapper.classList.add('animating');
this.playAnimation('close');
} else {
@@ -161,9 +160,9 @@
_onNeonAnimationFinish: function() {
this.$.contentWrapper.classList.remove('animating');
if (this.opened) {
- Polymer.IronOverlayBehaviorImpl._finishRenderOpened.apply(this);
+ this._finishRenderOpened();
} else {
- Polymer.IronOverlayBehaviorImpl._finishRenderClosed.apply(this);
+ this._finishRenderClosed();
}
},
@@ -172,30 +171,14 @@
* to configure specific parts of the opening and closing animations.
*/
_updateAnimationConfig: function() {
- var animationConfig = {};
- var animations = [];
-
- if (this.openAnimationConfig) {
- // NOTE(cdata): When making `display:none` elements visible in Safari,
- // the element will paint once in a fully visible state, causing the
- // dropdown to flash before it fades in. We prepend an
- // `opaque-animation` to fix this problem:
- animationConfig.open = [{
- name: 'opaque-animation',
- }].concat(this.openAnimationConfig);
- animations = animations.concat(animationConfig.open);
+ var animations = (this.openAnimationConfig || []).concat(this.closeAnimationConfig || []);
+ for (var i = 0; i < animations.length; i++) {
+ animations[i].node = this.containedElement;
}
-
- if (this.closeAnimationConfig) {
- animationConfig.close = this.closeAnimationConfig;
- animations = animations.concat(animationConfig.close);
- }
-
- animations.forEach(function(animation) {
- animation.node = this.containedElement;
- }, this);
-
- this.animationConfig = animationConfig;
+ this.animationConfig = {
+ open: this.openAnimationConfig,
+ close: this.closeAnimationConfig
+ };
},
/**
@@ -210,30 +193,6 @@
},
/**
- * Useful to call this after the element, the window, or the `fitInfo`
- * element has been resized. Will maintain the scroll position.
- */
- refit: function () {
- if (!this.opened) {
- return
- }
- var containedElement = this.containedElement;
- var scrollTop;
- var scrollLeft;
-
- if (containedElement) {
- scrollTop = containedElement.scrollTop;
- scrollLeft = containedElement.scrollLeft;
- }
- Polymer.IronFitBehavior.refit.apply(this, arguments);
-
- if (containedElement) {
- containedElement.scrollTop = scrollTop;
- containedElement.scrollLeft = scrollLeft;
- }
- },
-
- /**
* Apply focus to focusTarget or containedElement
*/
_applyFocus: function () {

Powered by Google App Engine
This is Rietveld 408576698