Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 12 additions & 5 deletions src/rails.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@
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 @@ -276,7 +276,7 @@

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

$(rails.formSubmitSelector).live('submit.rails', function(e) {
var form = $(this),
Expand Down Expand Up @@ -309,15 +309,22 @@
});

$(rails.formInputClickSelector).live('click.rails', function(event) {
var button = $(this);
var button = $(this),
remote = form.data('remote') !== undefined;

if (!rails.allowAction(button)) return rails.stopEverything(event);

// register the pressed submit button
var name = button.attr('name'),
data = name ? {name:name, value:button.val()} : null;

button.closest('form').data('ujs:submit-button', data);
var form = button.closest('form');
form.data('ujs:submit-button', data);

if(remote) {
rails.handleRemote(form);
return false;
}
});

$(rails.formSubmitSelector).live('ajax:beforeSend.rails', function(event) {
Expand Down
31 changes: 24 additions & 7 deletions test/public/test/data-remote.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@ module('data-remote', {
method: 'post'
}))
.find('form').append($('<input type="text" name="user_name" value="john">'));

}
});

asyncTest('clicking on a link with data-remote attribute', 5, function() {
$('a[data-remote]')
.bind('ajax:success', function(e, data, status, xhr) {
.bind('ajax:success', function(e, data, status, xhr) {
App.assert_callback_invoked('ajax:success');
App.assert_request_path(data, '/echo');
equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value');
equal(data.params.data2, 'value2', 'ajax arguments should have key data2 with right value');
App.assert_get_request(data);
App.assert_get_request(data);
})
.bind('ajax:complete', function() { start() })
.trigger('click');
Expand All @@ -44,12 +43,12 @@ asyncTest('changing a select option with data-remote attribute', 5, function() {
);

$('select[data-remote]')
.bind('ajax:success', function(e, data, status, xhr) {
.bind('ajax:success', function(e, data, status, xhr) {
App.assert_callback_invoked('ajax:success');
App.assert_request_path(data, '/echo');
equal(data.params.user_data, 'optionValue2', 'ajax arguments should have key term with right value');
equal(data.params.data1, 'value1', 'ajax arguments should have key data1 with right value');
App.assert_get_request(data);
App.assert_get_request(data);
})
.bind('ajax:complete', function() { start() })
.val('optionValue2')
Expand All @@ -58,16 +57,34 @@ asyncTest('changing a select option with data-remote attribute', 5, function() {

asyncTest('submitting form with data-remote attribute', 4, function() {
$('form[data-remote]')
.bind('ajax:success', function(e, data, status, xhr) {
.bind('ajax:success', function(e, data, status, xhr) {
App.assert_callback_invoked('ajax:success');
App.assert_request_path(data, '/echo');
equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value');
App.assert_post_request(data);
App.assert_post_request(data);
})
.bind('ajax:complete', function() { start() })
.trigger('submit');
});

asyncTest('submitting form with data-remote submit button', 4, function() {
$('form')
.data('remote', false)
.append(
$('<submit />', {
'data-remote': true,
id: "remote-submit"
})
.bind('ajax:success', function(e, data, status, xhr) {
App.assert_callback_invoked('ajax:success');
App.assert_request_path(data, '/echo');
equal(data.params.user_name, 'john', 'ajax arguments should have key user_name with right value');
App.assert_post_request(data);
})
.bind('ajax:complete', function() { start() })
.trigger('submit#remote-submit');
});

asyncTest('form\'s submit bindings in browsers that don\'t support submit bubbling', 4, function() {
var form = $('form[data-remote]'), directBindingCalled = false;

Expand Down