Skip to content

Form inputs can use the form attribute too #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasmazza merged 2 commits into from
Jul 8, 2014
Merged

Form inputs can use the form attribute too #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca65264
Form inputs can use the form attribute too.
marnen Jun 9, 2014
05c9fca
Add test case for input with form ID.
marnen Jul 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
formSubmitSelector: 'form',

// Form input elements bound by jquery-ujs
formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])',

// Form input elements disabled during form submission
disableSelector: 'input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled',
Expand Down
33 changes: 33 additions & 0 deletions test/public/test/data-confirm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@ module('data-confirm', {
text: 'Click me'
}));

$('#qunit-fixture').append($('<form />', {
id: 'confirm',
action: '/echo',
'data-remote': 'true'
}));

$('#qunit-fixture').append($('<input />', {
type: 'submit',
form: 'confirm',
'data-confirm': 'Are you absolutely sure?'
}));

this.windowConfirm = window.confirm;
},
teardown: function() {
Expand Down Expand Up @@ -105,6 +117,27 @@ asyncTest('clicking on a button with data-confirm attribute. Confirm No.', 3, fu
}, 50);
});

asyncTest('clicking on a submit button with form and data-confirm attributes. Confirm No.', 3, function() {
var message;
// auto-decline:
window.confirm = function(msg) { message = msg; return false };

$('input[type=submit][form]')
.bind('confirm:complete', function(e, data) {
App.assertCallbackInvoked('confirm:complete');
ok(data == false, 'confirm:complete passes in confirm answer (false)');
})
.bind('ajax:beforeSend', function(e, data, status, xhr) {
App.assertCallbackNotInvoked('ajax:beforeSend');
})
.trigger('click');

setTimeout(function() {
equal(message, 'Are you absolutely sure?');
start();
}, 50);
});

asyncTest('binding to confirm event of a link and returning false', 1, function() {
// redefine confirm function so we can make sure it's not called
window.confirm = function(msg) {
Expand Down