From c9f3ddc9c1e4660ac86ec6ab33c927753a2f59bc Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 14 Dec 2012 12:37:53 +0100 Subject: Do not include the pjax js and remove the pjax line This was breaking inclusion of other js. --- app/assets/javascripts/application.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'app/assets/javascripts/application.js') 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 . -- cgit v1.2.3