Index: ui/webui/resources/js/cr/ui/card_slider.js |
diff --git a/ui/webui/resources/js/cr/ui/card_slider.js b/ui/webui/resources/js/cr/ui/card_slider.js |
index f19199125a176aec21ba2b7015f24e4fd55279e9..bc04c76e40db1ce21b8665707892da8bdf8841f0 100644 |
--- a/ui/webui/resources/js/cr/ui/card_slider.js |
+++ b/ui/webui/resources/js/cr/ui/card_slider.js |
@@ -137,7 +137,7 @@ cr.define('cr.ui', function() { |
this.onMouseWheel_.bind(this)); |
} |
this.container_.addEventListener( |
- 'webkitTransitionEnd', this.onWebkitTransitionEnd_.bind(this)); |
+ 'transitionend', this.ontransitionend_.bind(this)); |
// Also support touch events in case a touch screen happens to be |
// available. Note that this has minimal impact in the common case of |
@@ -328,12 +328,12 @@ cr.define('cr.ui', function() { |
}, |
/** |
- * Handles the ends of -webkit-transitions on transform (animated |
+ * Handles the ends of transitions on transform (animated |
* card switches). |
- * @param {Event} e The webkitTransitionEnd event. |
+ * @param {Event} e The transitionend event. |
* @private |
*/ |
- onWebkitTransitionEnd_: function(e) { |
+ ontransitionend_: function(e) { |
Dan Beam
2016/11/29 06:17:12
onTransitionEnd_
Eric Willigers
2016/11/30 04:04:56
Done.
|
// Ignore irrelevant transitions that might bubble up. |
if (e.target !== this.container_ || e.propertyName != 'transform') |
return; |
@@ -569,7 +569,7 @@ cr.define('cr.ui', function() { |
transition = 'transform ' + CardSlider.TRANSITION_TIME_ + |
'ms ease-in-out'; |
} |
- this.container_.style.WebkitTransition = transition; |
+ this.container_.style.transition = transition; |
this.translateTo_(this.currentLeft_); |
return true; |
@@ -599,7 +599,7 @@ cr.define('cr.ui', function() { |
*/ |
onTouchStart_: function(e) { |
e = /** @type {!cr.ui.TouchHandler.Event} */(e); |
- this.container_.style.WebkitTransition = ''; |
+ this.container_.style.transition = ''; |
e.enableDrag = true; |
}, |