Merge branch 'bootstrap' into 'master'

Bootstrap

Closes #10

See merge request !2

1 files changed, 4 insertions, 14 deletions

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1f73af92..88e4080e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -1,11 +1,10 @@
 //= require jquery
-//= require jquery.turbolinks
 //= require jquery_ujs
-//= require turbolinks
 //= require jquery.ui.all
 //= require jquery.validate
 //= require jquery.embedly
 //= require tag-it
+//= require popper
 //= require bootstrap
 //= require bootstrap-multiselect
 //= require underscore
@@ -14,17 +13,8 @@
 //= require backbone.marionette
 //= require backbone_rails_sync
 //= require backbone_datalink
-//= require backbone/cakeside
 //= require backbone-model-file-upload
-//= require_tree .
+//= require cakeside
+//= require_self
 
-var initialize = function(){
-  $('.tooltip-item').tooltip();
-  $(window).scroll(function(){
-    if ($(window).scrollTop() >= ($(document).height() - $(window).height())*0.8){
-      $('.more-button').trigger('click');
-    }
-  });
-};
-$(document).ready(initialize);
-$(document).on("page:load", initialize);
+CakeSide.Behaviour.install();