Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/ssinghi/jquery-ujs into ssi…
Browse files Browse the repository at this point in the history
…nghi-master
  • Loading branch information
JangoSteve committed Sep 4, 2011
2 parents dd9384f + ba5808e commit 8617245
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/rails.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote]',

// Select elements bound by jquery-ujs
selectChangeSelector: 'select[data-remote]',
selectChangeSelector: 'select[data-remote], input[type="checkbox"][data-remote]',

// Form elements bound by jquery-ujs
formSubmitSelector: 'form',
Expand Down Expand Up @@ -114,15 +114,15 @@
data.push(button);
element.data('ujs:submit-button', null);
}
} else if (element.is('select')) {
} else if (element.is('select') || element.is("input[type='checkbox']")) {
method = element.data('method');
url = element.data('url');
data = element.serialize();
if (element.data('params')) data = data + "&" + element.data('params');
if (element.data('params')) data = data + "&" + element.data('params');
} else {
method = element.data('method');
url = element.attr('href');
data = element.data('params') || null;
data = element.data('params') || null;
}

options = {
Expand Down Expand Up @@ -277,7 +277,7 @@

rails.handleRemote(link);
return false;
});
});

$(rails.formSubmitSelector).live('submit.rails', function(e) {
var form = $(this),
Expand Down

0 comments on commit 8617245

Please sign in to comment.