Navigation: Only bind to browser's AnimationEnd event. Fixes jquery-a…

…rchive#5156.
nonplus · Oct 11, 2013 · 6244d94 · 6244d94
1 parent 0730c45
commit 6244d94
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/demos/examples/backbone-require/js/libs/jquerymobile.js b/demos/examples/backbone-require/js/libs/jquerymobile.js
@@ -4082,11 +4082,11 @@ $.mobile.getMaxScrollForTransition = $.mobile.getMaxScrollForTransition || defau
 	/* exposed $.mobile methods */
 
 	//animation complete callback
+	var animationEndEvent = "WebKitTransitionEvent" in window ? "webkitAnimationEnd" : "animationend";
 	$.fn.animationComplete = function( callback ) {
 		if ( $.support.cssTransitions ) {
-			return $( this ).one( 'webkitAnimationEnd animationend', callback );
-		}
-		else{
+			return $( this ).one( animationEndEvent, callback );
+		} else {
 			// defer execution for consistency between webkit/non webkit
 			setTimeout( callback, 0 );
 			return $( this );

diff --git a/js/jquery.mobile.navigation.js b/js/jquery.mobile.navigation.js
@@ -321,11 +321,11 @@ define( [
 	/* exposed $.mobile methods */
 
 	//animation complete callback
+	var animationEndEvent = "WebKitTransitionEvent" in window ? "webkitAnimationEnd" : "animationend";
 	$.fn.animationComplete = function( callback ) {
 		if ( $.support.cssTransitions ) {
-			return $( this ).one( 'webkitAnimationEnd animationend', callback );
-		}
-		else{
+			return $( this ).one( animationEndEvent, callback );
+		} else {
 			// defer execution for consistency between webkit/non webkit
 			setTimeout( callback, 0 );
 			return $( this );