AnimationComplete: change default to durationDefault fix duration read

arschmitz · arschmitz · commit 5bbb46a4fc2f · 2014-02-18T16:54:24.000-05:00
Safegurard against NAN values and fix camelcase of duration name Fixes jquery-archivegh-7114 Fixes jquery-archivegh-7116 Closes jquery-archivegh-7119
diff --git a/js/jquery.mobile.animationComplete.js b/js/jquery.mobile.animationComplete.js
@@ -34,7 +34,6 @@ define( [
 
 		// All lower case if not a vendor prop
 		if ( props[ test ][ "prefix" ] === "" ) {
-			props[ test ][ "duration" ] = props[ test ][ "duration" ].toLowerCase();
 			props[ test ][ "event" ] = props[ test ][ "event" ].toLowerCase();
 		}
 	});
@@ -70,8 +69,8 @@ define( [
 				}
 
 				// If we could not read a duration use the default
-				if ( duration === 0 || duration === undefined ) {
-					duration = $.fn.animationComplete.default;
+				if ( duration === 0 || duration === undefined || isNaN( duration ) ) {
+					duration = $.fn.animationComplete.defaultDuration;
 				}
 			}
 
@@ -98,7 +97,7 @@ define( [
 	};
 
 	// Allow default callback to be configured on mobileInit
-	$.fn.animationComplete.default = 1000;
+	$.fn.animationComplete.defaultDuration = 1000;
 })( jQuery );
 //>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
 });

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ define( [`
`34`	`34`
`35`	`35`	`// All lower case if not a vendor prop`
`36`	`36`	`if ( props[ test ][ "prefix" ] === "" ) {`
`37`		`- props[ test ][ "duration" ] = props[ test ][ "duration" ].toLowerCase();`
`38`	`37`	`props[ test ][ "event" ] = props[ test ][ "event" ].toLowerCase();`
`39`	`38`	`}`
`40`	`39`	`});`
`@@ -70,8 +69,8 @@ define( [`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`// If we could not read a duration use the default`
`73`		`- if ( duration === 0 \|\| duration === undefined ) {`
`74`		`- duration = $.fn.animationComplete.default;`
	`72`	`+ if ( duration === 0 \|\| duration === undefined \|\| isNaN( duration ) ) {`
	`73`	`+ duration = $.fn.animationComplete.defaultDuration;`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`
`@@ -98,7 +97,7 @@ define( [`
`98`	`97`	`};`
`99`	`98`
`100`	`99`	`// Allow default callback to be configured on mobileInit`
`101`		`- $.fn.animationComplete.default = 1000;`
	`100`	`+ $.fn.animationComplete.defaultDuration = 1000;`
`102`	`101`	`})( jQuery );`
`103`	`102`	`//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);`
`104`	`103`	`});`