Index: chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js |
diff --git a/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js b/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js |
index 2b1b4e0d2cd6fb9147eebd4b6bf799f55dbd5efa..df556aced28b1d191597696732d91f1693318e0a 100644 |
--- a/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js |
+++ b/chrome/browser/resources/pdf/elements/viewer-zoom-toolbar/viewer-zoom-button.js |
@@ -5,10 +5,6 @@ |
Polymer({ |
is: 'viewer-zoom-button', |
- behaviors: [ |
- Polymer.NeonAnimationRunnerBehavior |
- ], |
- |
properties: { |
/** |
* Icons to be displayed on the FAB. Multiple icons should be separated with |
@@ -30,16 +26,15 @@ Polymer({ |
tooltips: Array, |
- opened: { |
+ closed: { |
type: Boolean, |
- value: true |
+ reflectToAttribute: true, |
+ value: false |
}, |
- delay: Number, |
- |
- animationConfig: { |
- type: Object, |
- computed: 'computeAnimationConfig_(delay)' |
+ delay: { |
+ type: Number, |
+ observer: 'delayChanged_' |
}, |
/** |
@@ -65,31 +60,6 @@ Polymer({ |
} |
}, |
- computeAnimationConfig_: function(delay) { |
- return { |
- 'entry': { |
- name: 'transform-animation', |
- node: this, |
- timing: { |
- easing: 'cubic-bezier(0, 0, 0.2, 1)', |
- duration: 250, |
- delay: delay |
- }, |
- transformFrom: 'translateX(100%)' |
- }, |
- 'exit': { |
- name: 'transform-animation', |
- node: this, |
- timing: { |
- easing: 'cubic-bezier(0.4, 0, 1, 1)', |
- duration: 250, |
- delay: delay |
- }, |
- transformTo: 'translateX(100%)' |
- } |
- }; |
- }, |
- |
computeIconsArray_: function(icons) { |
return icons.split(' '); |
}, |
@@ -102,29 +72,16 @@ Polymer({ |
return tooltips[activeIndex]; |
}, |
- listeners: { |
- 'neon-animation-finish': '_onAnimationFinished' |
- }, |
- |
- _onAnimationFinished: function() { |
- this.style.transform = this.opened ? 'none' : 'translateX(100%)'; |
+ delayChanged_: function() { |
+ this.$.wrapper.style.transitionDelay = this.delay + 'ms'; |
}, |
show: function() { |
- if (!this.opened) { |
- this.toggle_(); |
- } |
+ this.closed = false; |
}, |
hide: function() { |
- if (this.opened) |
- this.toggle_(); |
- }, |
- |
- toggle_: function() { |
- this.opened = !this.opened; |
- this.cancelAnimation(); |
- this.playAnimation(this.opened ? 'entry' : 'exit'); |
+ this.closed = true; |
}, |
fireClick: function() { |