Skip to content

Commit 79b0f13

Browse files
authored
Merge pull request #472 from Nightforge/jquery3
ready for jQuery 3
2 parents e66be09 + f6471b2 commit 79b0f13

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/rails.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -416,15 +416,15 @@
416416
});
417417
});
418418

419-
$document.delegate(rails.linkDisableSelector, 'ajax:complete', function() {
419+
$document.on('ajax:complete', rails.linkDisableSelector, function() {
420420
rails.enableElement($(this));
421421
});
422422

423-
$document.delegate(rails.buttonDisableSelector, 'ajax:complete', function() {
423+
$document.on('ajax:complete', rails.buttonDisableSelector, function() {
424424
rails.enableFormElement($(this));
425425
});
426426

427-
$document.delegate(rails.linkClickSelector, 'click.rails', function(e) {
427+
$document.on('click.rails', rails.linkClickSelector, function(e) {
428428
var link = $(this), method = link.data('method'), data = link.data('params'), metaClick = e.metaKey || e.ctrlKey;
429429
if (!rails.allowAction(link)) return rails.stopEverything(e);
430430

@@ -448,7 +448,7 @@
448448
}
449449
});
450450

451-
$document.delegate(rails.buttonClickSelector, 'click.rails', function(e) {
451+
$document.on('click.rails', rails.buttonClickSelector, function(e) {
452452
var button = $(this);
453453

454454
if (!rails.allowAction(button) || !rails.isRemote(button)) return rails.stopEverything(e);
@@ -465,15 +465,15 @@
465465
return false;
466466
});
467467

468-
$document.delegate(rails.inputChangeSelector, 'change.rails', function(e) {
468+
$document.on('change.rails', rails.inputChangeSelector, function(e) {
469469
var link = $(this);
470470
if (!rails.allowAction(link) || !rails.isRemote(link)) return rails.stopEverything(e);
471471

472472
rails.handleRemote(link);
473473
return false;
474474
});
475475

476-
$document.delegate(rails.formSubmitSelector, 'submit.rails', function(e) {
476+
$document.on('submit.rails', rails.formSubmitSelector, function(e) {
477477
var form = $(this),
478478
remote = rails.isRemote(form),
479479
blankRequiredInputs,
@@ -518,7 +518,7 @@
518518
}
519519
});
520520

521-
$document.delegate(rails.formInputClickSelector, 'click.rails', function(event) {
521+
$document.on('click.rails', rails.formInputClickSelector, function(event) {
522522
var button = $(this);
523523

524524
if (!rails.allowAction(button)) return rails.stopEverything(event);
@@ -539,11 +539,11 @@
539539
form.data('ujs:submit-button-formmethod', button.attr('formmethod'));
540540
});
541541

542-
$document.delegate(rails.formSubmitSelector, 'ajax:send.rails', function(event) {
542+
$document.on('ajax:send.rails', rails.formSubmitSelector, function(event) {
543543
if (this === event.target) rails.disableFormElements($(this));
544544
});
545545

546-
$document.delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) {
546+
$document.on('ajax:complete.rails', rails.formSubmitSelector, function(event) {
547547
if (this === event.target) rails.enableFormElements($(this));
548548
});
549549

test/server.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'sinatra'
22
require 'json'
33

4-
JQUERY_VERSIONS = %w[ 1.8.0 1.8.1 1.8.2 1.8.3 1.9.0 1.9.1 1.10.0 1.10.1 1.10.2 1.11.0 2.0.0 2.1.0].freeze
4+
JQUERY_VERSIONS = %w[ 1.8.0 1.8.1 1.8.2 1.8.3 1.9.0 1.9.1 1.10.0 1.10.1 1.10.2 1.11.0 2.0.0 2.1.0 3.0.0].freeze
55

66
use Rack::Static, :urls => ["/src"], :root => File.expand_path('..', settings.root)
77

0 commit comments

Comments
 (0)