Skip to content
Browse files

Fixedtoolbar: Fix incorrect event binding in _on. Fixes #5487 - Page …

…padding should be applied before transition starts
  • Loading branch information...
1 parent c99a067 commit 1b242789406d8aeebc9d24cd363b8909bb2dd9f3 @arschmitz arschmitz committed
Showing with 3 additions and 4 deletions.
  1. +3 −1 js/widgets/fixedToolbar.js
  2. +0 −3 js/widgets/forms/textinput.js
View
4 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"
});
View
3 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 );
},

0 comments on commit 1b24278

Please sign in to comment.
Something went wrong with that request. Please try again.