Fixedtoolbar: Fix incorrect event binding in _on. Fixes jquery-archive#5487 - Page padding should be applied before transition starts

arschmitz · arschmitz · commit 1b242789406d · 2013-01-18T11:03:14.000-05:00
diff --git a/js/widgets/fixedToolbar.js b/js/widgets/fixedToolbar.js
@@ -89,7 +89,9 @@ define( [ "jquery", "../jquery.mobile.widget", "../jquery.mobile.core", "../jque
 			// This method is meant to disable zoom while a fixed-positioned toolbar page is visible
 			this._on( this._thisPage, {
 				"pagebeforeshow": "_handlePageBeforeShow",
-				"webkitAnimationStart animationstart updatelayout": "_handleAnimationStart",
+				"webkitAnimationStart":"_handleAnimationStart",
+				"animationstart":"_handleAnimationStart",
+				"updatelayout": "_handleAnimationStart",
 				"pageshow": "_handlePageShow",
 				"pagebeforehide": "_handlePageBeforeHide"
 			});
diff --git a/js/widgets/forms/textinput.js b/js/widgets/forms/textinput.js
@@ -154,10 +154,7 @@ $.widget( "mobile.textinput", $.mobile.widget, {
 			
 		if ( parentNeedsDisabled ) {
 			$el = this.element.parent();
-		} else {
-			$el = this.element;
 		}
-		$el.addClass( "ui-disabled" );
 		return this._setOption( "disabled", true );
 	},
 

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,7 @@ $.widget( "mobile.textinput", $.mobile.widget, {`
`154`	`154`
`155`	`155`	`if ( parentNeedsDisabled ) {`
`156`	`156`	`$el = this.element.parent();`
`157`		`- } else {`
`158`		`- $el = this.element;`
`159`	`157`	`}`
`160`		`- $el.addClass( "ui-disabled" );`
`161`	`158`	`return this._setOption( "disabled", true );`
`162`	`159`	`},`
`163`	`160`