diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-03 22:59:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 22:59:43 -0400 |
| commit | 8648f289f01656b2258687126108c389127108e0 (patch) | |
| tree | 1ccb15f72f00d8c30497ad4e48f203545dd3383b /actionview/test/ujs/views/layouts/application.html.erb | |
| parent | 28b3582aa2cd6007c708134b911b3f360ad5d659 (diff) | |
| parent | e8c33349bfabca28996ac74d344d69c7aaffec50 (diff) | |
| download | rails-8648f289f01656b2258687126108c389127108e0.tar.gz rails-8648f289f01656b2258687126108c389127108e0.tar.bz2 rails-8648f289f01656b2258687126108c389127108e0.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'actionview/test/ujs/views/layouts/application.html.erb')
| -rw-r--r-- | actionview/test/ujs/views/layouts/application.html.erb | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/actionview/test/ujs/views/layouts/application.html.erb b/actionview/test/ujs/views/layouts/application.html.erb index 74fa3bd06d..a69cd2d739 100644 --- a/actionview/test/ujs/views/layouts/application.html.erb +++ b/actionview/test/ujs/views/layouts/application.html.erb @@ -3,30 +3,15 @@ <head> <title><%= @title %></title> <link href="/vendor/qunit.css" media="screen" rel="stylesheet" type="text/css" media="screen, projection" /> - <style> - #jquery-cdn, #jquery-version { - padding: 0 2em .8em 0; - text-align: right; - font-family: sans-serif; - line-height: 1; - color: #8699A4; - background-color: #0d3349; - } - #jquery-cdn a, #jquery-version a { - color: white; - text-decoration: underline; - } - </style> - - <%= script_tag jquery_src %> + <%= script_tag "http://code.jquery.com/jquery-2.2.0.js" %> <script> // This is for test in override.js. - // Must go after jQuery is loaded, but before jquery-ujs. - $(document).bind('rails:attachBindings', function() { - $.rails.linkClickSelector += ', a[data-custom-remote-link]'; + // Must go before rails-ujs. + document.addEventListener('rails:attachBindings', function() { + window.Rails.linkClickSelector += ', a[data-custom-remote-link]'; // Hijacks link click before ujs binds any handlers // This is only used for ctrl-clicking test on remote links - $.rails.delegate(document, '#qunit-fixture a', 'click', function(e) { + window.Rails.delegate(document, '#qunit-fixture a', 'click', function(e) { e.preventDefault(); }); }); |