diff options
| -rw-r--r-- | app/assets/javascripts/application.js | 13 | ||||
| -rw-r--r-- | app/views/layouts/application.html.haml | 1 | ||||
| -rw-r--r-- | core/lib/leap_web_core/dependencies.rb | 1 | ||||
| -rw-r--r-- | core/lib/leap_web_core/ui_dependencies.rb | 1 | ||||
| -rw-r--r-- | help/app/views/tickets/index.html.haml | 5 | ||||
| -rw-r--r-- | ui_dependencies.rb | 1 |
6 files changed, 5 insertions, 17 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 diff --git a/core/lib/leap_web_core/dependencies.rb b/core/lib/leap_web_core/dependencies.rb index 00ef515..7f6ca87 100644 --- a/core/lib/leap_web_core/dependencies.rb +++ b/core/lib/leap_web_core/dependencies.rb @@ -11,7 +11,6 @@ module LeapWebCore "haml" => "~> 3.1.7", "bootstrap-sass" => "~> 2.0.4", "jquery-rails" => nil, - "pjax_rails" => nil, "simple_form" => nil } diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb index 8ca9b91..e0a0b86 100644 --- a/core/lib/leap_web_core/ui_dependencies.rb +++ b/core/lib/leap_web_core/ui_dependencies.rb @@ -2,7 +2,6 @@ require "haml" require "bootstrap-sass" require "jquery-rails" require "simple_form" -require "pjax_rails" if Rails.env == "development" require "haml-rails" diff --git a/help/app/views/tickets/index.html.haml b/help/app/views/tickets/index.html.haml index fdbeec5..23a503d 100644 --- a/help/app/views/tickets/index.html.haml +++ b/help/app/views/tickets/index.html.haml @@ -15,8 +15,3 @@ Create a = render @tickets.all = paginate @tickets -%div{"data-pjax-container" => ""} - / PJAX updates will go here - hmmm - - diff --git a/ui_dependencies.rb b/ui_dependencies.rb index 10eac67..c0779c0 100644 --- a/ui_dependencies.rb +++ b/ui_dependencies.rb @@ -2,7 +2,6 @@ gem "haml", "~> 3.1.7" gem "bootstrap-sass", "~> 2.1.0" gem "jquery-rails" gem "simple_form" -gem "pjax_rails" gem 'client_side_validations' gem 'client_side_validations-simple_form' gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be issues with 0.14.0 when using couchrest |