Merge remote branch 'origin/master'

This commit is contained in:
toddparker 2011-04-06 09:59:48 -04:00
commit d22b0a9f61
2 changed files with 4 additions and 2 deletions

View file

@ -81,7 +81,7 @@ $.event.special.tap = {
function clearTapHandlers() {
touching = false;
clearTimeout(timer);
$(this).unbind("vmouseclick", clickHandler).unbind("vmousecancel", clearTapHandlers);
$(this).unbind("vclick", clickHandler).unbind("vmousecancel", clearTapHandlers);
}
function clickHandler(event) {

View file

@ -101,8 +101,10 @@ $.widget( "mobile.checkboxradio", $.mobile.widget, {
},
_updateAll: function(){
var self = this;
this._getInputSet().each(function(){
if( $(this).is(":checked") || this.inputtype === "checkbox" ){
if( $(this).is(":checked") || self.inputtype === "checkbox" ){
$(this).trigger("change");
}
})