Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-04-29 02:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'origin/master'

Browse source
This commit is contained in:
toddparker 2011-08-03 14:17:40 -04:00
commit 35b174fa31
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/jquery.mobile.forms.select.js
View file

@ -545,7 +545,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
// 30px tolerance off the edges
if ( newleft < 30 ) {
newleft = 30;
} else if ( (newleft + menuWidth) > screenWidth ) {
} else if ( ( newleft + menuWidth ) > screenWidth ) {
newleft = screenWidth - menuWidth - 30;
}
}
@ -591,8 +591,7 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
// where the objects don't define data urls which prevents dialog key
// stripping - changePage has incoming refactor
window.history.back();
}
else{
} else{
self.screen.addClass( "ui-screen-hidden" );
self.listbox.addClass( "ui-selectmenu-hidden" ).removeAttr( "style" ).removeClass( "in" );
self._focusButton();