diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:13:51 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:13:51 +0100 |
| commit | d56a009ce084bd14dbd5a876010961caca16da5c (patch) | |
| tree | 50cb41b8326f4764e3e08bf55aa88bbe948e1bf2 /app | |
| parent | d37fe6ada458b80019d16803fc73e5c406dc515f (diff) | |
| parent | c8d01944816277f2e0361c1fce0f4b1a94b3f66f (diff) | |
Merge branch 'feature/clean-up-pjax-for-now' of https://github.com/leapcode/leap_web
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js | 13 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3fd641c..e6f6024 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,17 +13,14 @@ //= require jquery //= require jquery_ujs //= require srp -//= require users -//= require_tree . //= require bootstrap //= require bootstrap-editable //= require bootstrap-editable-rails //= require bootstrap-editable-inline -//= require jquery.pjax -//= require tickets - -$(function() { - $('a:not([data-remote]):not([data-behavior]):not([data-skip-pjax])').pjax('[data-pjax-container]'); -}); //= require rails.validations //= require rails.validations.simple_form + +//= require tickets +//= require users + +//= require_tree . diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index bd03477..e6d22f0 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,6 +19,5 @@ .row .span12 = render 'layouts/messages' - %div{"data-pjax-container" => ""} = yield %footer |