fixed conflic

2017-10-31 12:13:19 +06:30
parent 56940d7f00 e3b536d58c
commit cfa819f985
69 changed files with 618 additions and 506 deletions
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,6 +1,6 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
  $('body').bootstrapMaterialDesign();
-  
+
  var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));

  $('#custom-slimscroll').slimScroll({
@@ -40,8 +40,10 @@ $(document).on('turbolinks:load', function() {
            type: method,
            url: url ,            
            success: function(data) {
+              // console.log(data.url);
+              location.href = data.url;
            }
-         }); 
+         });          
        } else {
            swal("Cancelled", "Your imaginary file is safe :)", "error");
        }