Skip to content

Commit 096d08f

Browse files
author
Tortue Torche
committed
Update to latest jquery-ujs v1.0.1
1 parent ada244a commit 096d08f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

provider/assets/javascripts/jquery_ujs.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Unobtrusive scripting adapter for jQuery
55
* https://github.com/rails/jquery-ujs
66
*
7-
* Requires jQuery 1.7.0 or later.
7+
* Requires jQuery 1.8.0 or later.
88
*
99
* Released under the MIT license
1010
*
@@ -25,7 +25,7 @@
2525
linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with], a[data-disable]',
2626

2727
// Button elements bound by jquery-ujs
28-
buttonClickSelector: 'button[data-remote], button[data-confirm]',
28+
buttonClickSelector: 'button[data-remote]:not(form button), button[data-confirm]:not(form button)',
2929

3030
// Select elements bound by jquery-ujs
3131
inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]',
@@ -34,7 +34,7 @@
3434
formSubmitSelector: 'form',
3535

3636
// Form input elements bound by jquery-ujs
37-
formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type])',
37+
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])',
3838

3939
// Form input elements disabled during form submission
4040
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',
@@ -356,6 +356,7 @@
356356

357357
$document.delegate(rails.buttonClickSelector, 'click.rails', function(e) {
358358
var button = $(this);
359+
359360
if (!rails.allowAction(button)) return rails.stopEverything(e);
360361

361362
if (button.is(rails.buttonDisableSelector)) rails.disableFormElement(button);

0 commit comments

Comments
 (0)