Hopiu/jquery-mobile
1
0
Fork 0
mirror of https://github.com/Hopiu/jquery-mobile.git synced 2026-03-16 22:10:25 +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:
Kin Blas 2011-05-27 10:55:20 -07:00
commit 991db0de46
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -110,7 +110,7 @@ init:
# Build the minified JS file
min: init js
# Build the minified Javascript file
# Build the minified JavaScript file
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${MIN}
@@java -jar build/google-compiler-20110405.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}

15
js/jquery.mobile.forms.checkboxradio.js
View file

@ -58,13 +58,13 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
}
self._cacheVals();
input.attr( "checked", inputtype === "radio" && true || !input.is( ":checked" ) );
input.prop( "checked", inputtype === "radio" && true || !(input.prop("checked")) );
// input set for common radio buttons will contain all the radio
// buttons, but will not for checkboxes. clearing the checked status
// of other radios ensures the active button state is applied properly
self._getInputSet().not(input).removeAttr('checked');
self._getInputSet().not(input).prop('checked', false);
self._updateAll();
return false;
@ -79,6 +79,13 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
},
vclick: function(){
// adds checked attribute to checked input when keyboard is used
if ($(this).is(":checked")) {
$(this).prop( "checked", true);
self._getInputSet().not($(this)).prop('checked', false);
} else {
$(this).prop("checked", false);
}
self._updateAll();
},
@ -125,7 +132,7 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
// input[0].checked expando doesn't always report the proper value
// for checked='checked'
if ( $(input[0]).attr('checked') ) {
if ( $(input[0]).prop('checked') ) {
label.addClass( $.mobile.activeBtnClass );
icon.addClass( this.checkedicon ).removeClass( this.uncheckedicon );

6
themes/default/jquery.mobile.core.css
View file

@ -14,14 +14,14 @@
.ui-mobile-viewport { margin: 0; overflow-x: hidden; -webkit-text-size-adjust: none; -ms-text-size-adjust:none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
/* "page" containers - full-screen views, one should always be in view post-pageload */
.ui-mobile [data-role=page], .ui-mobile [data-role=dialog], .ui-page { top: 0; left: 0; width: 100%; min-height: 100%; position: absolute; display: none; border: 0; }
.ui-mobile [data-role=page], .ui-mobile [data-role=dialog], .ui-page { top: 0; left: 0; width: 100%; min-height: 100%; height: auto !important; height: 100%; position: absolute; display: none; border: 0; }
.ui-mobile .ui-page-active { display: block; overflow: visible; }
/*orientations from js are available */
.portrait,
.portrait .ui-page { min-height: 100%; }
.portrait .ui-page,
.landscape,
.landscape .ui-page { min-height: 100%; }
.landscape .ui-page { min-height: 100%; height: auto !important; height: 100%; }
/* loading screen */
.ui-loading .ui-mobile-viewport { overflow: hidden !important; }