summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-14 12:37:53 +0100
committerAzul <azul@leap.se>2012-12-14 12:37:53 +0100
commitc9f3ddc9c1e4660ac86ec6ab33c927753a2f59bc (patch)
tree72f61f2802e24363f9b0e2192fea7d381423191f
parent30f953c06bbd71becfc59afb3fb49abaa853eacc (diff)
Do not include the pjax js and remove the pjax line
This was breaking inclusion of other js.
-rw-r--r--app/assets/javascripts/application.js13
1 files changed, 5 insertions, 8 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 .