diff options
| author | mo <mokha@cisco.com> | 2017-09-01 21:26:34 -0600 |
|---|---|---|
| committer | mo <mokha@cisco.com> | 2017-09-01 21:26:34 -0600 |
| commit | efec5e4ad0d83eb9e6fbce7743568cc3c4b8bca2 (patch) | |
| tree | c8727f3b7bf97e408df7df04598a803265756ae6 /app | |
| parent | 2b2cb9caa0df1f9234b8706febab06122441800d (diff) | |
remove turbolinks
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 4 |
3 files changed, 2 insertions, 8 deletions
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 %> |