summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authormo <mokha@cisco.com>2017-09-01 21:26:34 -0600
committermo <mokha@cisco.com>2017-09-01 21:26:34 -0600
commitefec5e4ad0d83eb9e6fbce7743568cc3c4b8bca2 (patch)
treec8727f3b7bf97e408df7df04598a803265756ae6 /app/assets/javascripts
parent2b2cb9caa0df1f9234b8706febab06122441800d (diff)
remove turbolinks
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js3
-rw-r--r--app/assets/javascripts/backbone/views/photos/new_modal_view.js.coffee3
2 files changed, 0 insertions, 6 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()