remove turbolinks

5 files changed, 3 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index bd12840f..17932ef3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,6 @@ gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'jquery-rails'
-gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 gem 'bcrypt', '~> 3.1.7'
 gem 'json', '~> 2.1.0'
@@ -14,7 +13,6 @@ gem 'json', '~> 2.1.0'
 gem 'acts-as-taggable-on'
 
 gem 'jquery-ui-rails', '~> 4.0.0'
-gem 'jquery-turbolinks'
 gem 'mini_magick'
 gem "kaminari"
 gem 'delayed_job_active_record'
diff --git a/Gemfile.lock b/Gemfile.lock
index f2b3b423..080f7402 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -685,9 +685,6 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-turbolinks (2.1.0)
-      railties (>= 3.1.0)
-      turbolinks
     jquery-ui-rails (4.0.5)
       railties (>= 3.1.0)
     js-routes (1.4.0)
@@ -904,9 +901,6 @@ GEM
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.3)
     twitter (6.1.0)
       addressable (~> 2.5)
       buftok (~> 0.2.0)
@@ -986,7 +980,6 @@ DEPENDENCIES
   i18n-tasks
   jbuilder (~> 2.0)
   jquery-rails
-  jquery-turbolinks
   jquery-ui-rails (~> 4.0.0)
   js-routes
   json (~> 2.1.0)
@@ -1009,7 +1002,6 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   teaspoon-jasmine (~> 2.3.4)
-  turbolinks
   twitter
   uglifier (>= 1.3.0)
   unf
@@ -1017,4 +1009,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.15.3
+   1.15.4
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 621bcd8b..77563570 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,7 +1,5 @@
 //= require jquery
-//= require jquery.turbolinks
 //= require jquery_ujs
-//= require turbolinks
 //= require jquery.ui.all
 //= require jquery.validate
 //= require jquery.embedly
@@ -20,7 +18,6 @@
 //= require_tree .
 
 var initialize = function(){
-  $('.tooltip-item').tooltip();
   $(window).scroll(function(){
     if ($(window).scrollTop() >= ($(document).height() - $(window).height())*0.8){
       $('.more-button').trigger('click');
diff --git a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee b/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee
index 0972bc52..b618ef16 100644
--- a/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee
+++ b/app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee
@@ -17,9 +17,6 @@ class CakeSide.Views.Photos.NewModalView extends Marionette.ItemView
     @cake = options.cake
     @model = new @collection.model(cake_id: @cake.id)
 
-  onRender: ->
-    @$('.tooltip-item').tooltip()
-
   save: (e) ->
     e.preventDefault()
     e.stopPropagation()
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index f65eb476..5a4cadd2 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,14 +11,14 @@
 <meta name="application-name" content="Cakeside">
 <meta name="apple-mobile-web-app-title" content="Cakeside">
 <meta name="apple-mobile-web-app-status-bar-style" content="black">
-<%= stylesheet_link_tag "application", media: "all", 'data-turbolinks-track' => true %>
+<%= stylesheet_link_tag "application", media: "all" %>
 <%= favicon_link_tag 'favicon.ico' %>
 <%= favicon_link_tag 'apple-touch-icon-57x57.png', rel: 'apple-touch-startup-image', type: 'image/png' %>
 <%= favicon_link_tag 'apple-touch-icon-57x57.png', rel: 'apple-touch-icon', type: 'image/png', sizes: "57x57" %>
 <%= favicon_link_tag 'apple-touch-icon-72x72.png', rel: 'apple-touch-icon', type: 'image/png', sizes: "72x72" %>
 <%= favicon_link_tag 'apple-touch-icon-114x114.png', rel: 'apple-touch-icon', type: 'image/png', sizes: "114x114" %>
 <%= yield :head %>
-<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
+<%= javascript_include_tag "application" %>
 <%# render "layouts/embedly"%>
 <%= yield :javascript %>
 <%= csrf_meta_tags %>