Slider: Move triggering before change to fix regression with highlight breaking out on track click with rangeslider.

Alexander Schmitz · Alexander Schmitz · commit a067c40e836b · 2012-12-25T23:55:43.000-05:00
diff --git a/js/widgets/forms/slider.js b/js/widgets/forms/slider.js
@@ -483,12 +483,11 @@ $.widget( "mobile.slider", $.mobile.widget, {
 				valueChanged = control[ 0 ].selectedIndex !== newval;
 				control[ 0 ].selectedIndex = newval;
 			}
-			if ( !isfromControl && valueChanged ) {
-				if ( this._trigger( "beforechange", event ) === false) {
+			if ( this._trigger( "beforechange", event ) === false) {
 					return false;
-				}
+			}
+			if ( !isfromControl && valueChanged ) {
 				control.trigger( "change" );
-
 			}
 		}
 	},

Original file line number	Diff line number	Diff line change
`@@ -483,12 +483,11 @@ $.widget( "mobile.slider", $.mobile.widget, {`
`483`	`483`	`valueChanged = control[ 0 ].selectedIndex !== newval;`
`484`	`484`	`control[ 0 ].selectedIndex = newval;`
`485`	`485`	`}`
`486`		`- if ( !isfromControl && valueChanged ) {`
`487`		`- if ( this._trigger( "beforechange", event ) === false) {`
	`486`	`+ if ( this._trigger( "beforechange", event ) === false) {`
`488`	`487`	`return false;`
`489`		`- }`
	`488`	`+ }`
	`489`	`+ if ( !isfromControl && valueChanged ) {`
`490`	`490`	`control.trigger( "change" );`
`491`		`-`
`492`	`491`	`}`
`493`	`492`	`}`
`494`	`493`	`},`