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

Merge branch 'master' of https://github.com/jquery/jquery-mobile

Browse source
This commit is contained in:
jblas@adobe.com 2011-10-19 10:38:32 -07:00
commit e080207145
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
css/structure/jquery.mobile.dialog.css
View file

@ -4,7 +4,7 @@
* Dual licensed under the MIT (MIT-LICENSE.txt) or GPL (GPL-LICENSE.txt) licenses.
*/
.ui-dialog { min-height: 480px; }
.ui-dialog .ui-header, .ui-dialog .ui-content, .ui-dialog .ui-footer { max-width: 500px; margin: 15px auto; padding: 15px; width: 85%; position: relative; }
.ui-dialog .ui-header, .ui-dialog .ui-content, .ui-dialog .ui-footer { max-width: 500px; margin: 10% auto 0 auto; padding: 15px; width: 85%; position: relative; }
.ui-dialog .ui-header { padding: 0 15px; }
.ui-dialog .ui-header, .ui-dialog .ui-footer { z-index: 10; }
.ui-dialog .ui-content, .ui-dialog .ui-footer { margin-top: -15px; }

7
tests/unit/checkboxradio/checkboxradio_core.js
View file

@ -51,16 +51,16 @@
$checkbox.unbind( "change" );
expect( 2 );
expect( 1 );
$checkbox.change(function(){
$checkbox.one('change', function(){
ok( true, "change fired on click to check the box" );
});
$checkboxLabel.trigger( "click" );
//test above will be triggered twice, and the start here once
$checkbox.change( function(){
$checkbox.one('change', function(){
start();
});
@ -119,7 +119,6 @@
// not testing the positive case here since's it's obviously tested elsewhere
test( "checkboxradio elements in the keepNative set shouldn't be enhanced", function() {
console.log( );
ok( !$("input.should-be-native").parent().is("div.ui-checkbox") );
});
})(jQuery);