From ae5dfaf19251f8b93590989f6cabde7878bd7954 Mon Sep 17 00:00:00 2001 From: Yan Date: Sun, 29 Oct 2017 14:20:24 +0630 Subject: [PATCH] test for no work js,it cause by turbolink --- app/assets/javascripts/BSBMaterial/admin.js | 2 +- app/assets/javascripts/BSBMaterial/demo.js | 2 +- .../javascripts/BSBMaterial/pages/index.js | 2 +- app/assets/javascripts/application.js | 18 +++++++++++++----- app/assets/javascripts/custom.js | 4 ++-- app/views/settings/zones/_form.html.erb | 5 ----- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js index c62b3f87..e93b0186 100755 --- a/app/assets/javascripts/BSBMaterial/admin.js +++ b/app/assets/javascripts/BSBMaterial/admin.js @@ -444,7 +444,7 @@ $.AdminBSB.browser = { } //========================================================================================================================== -$(document).on('turbolinks:load', function () { +$(document).ready(function(){ $.AdminBSB.browser.activate(); $.AdminBSB.leftSideBar.activate(); $.AdminBSB.rightSideBar.activate(); diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js index 87f67674..85f632ea 100755 --- a/app/assets/javascripts/BSBMaterial/demo.js +++ b/app/assets/javascripts/BSBMaterial/demo.js @@ -1,4 +1,4 @@ -$(document).on('turbolinks:load', function () { +$(document).ready(function(){ skinChanger(); activateNotificationAndTasksScroll(); diff --git a/app/assets/javascripts/BSBMaterial/pages/index.js b/app/assets/javascripts/BSBMaterial/pages/index.js index 7c3c3a39..5db70e5c 100755 --- a/app/assets/javascripts/BSBMaterial/pages/index.js +++ b/app/assets/javascripts/BSBMaterial/pages/index.js @@ -1,4 +1,4 @@ -$(document).on('turbolinks:load', function () { +$(document).ready(function(){ //Widgets count $('.count-to').countTo(); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 050231d3..b0c67ce0 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -16,9 +16,6 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_nested_form //= require jquery_ujs -//= require turbolinks -//= require cable -//= require settings/processing_items //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require multi-select/js/jquery.multi-select.js @@ -32,12 +29,23 @@ //= require morrisjs/morris.js //= require chartjs/Chart.bundle.js //= require fileinput.min +//= require turbolinks +//= require cable +//= require settings/processing_items //= require BSBMaterial/admin.js -//= require BSBMaterial/pages/index.js //= require BSBMaterial/demo.js //= require custom.js -$(document).on('turbolinks:load', function() { +$(document).ready(function(){ + $('.count-to').countTo(); + + //Sales count to + $('.sales-count-to').countTo({ + formatter: function (value, options) { + return '$' + value.toFixed(2).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, ' ').replace('.', ','); + } + }); + $('.datetimepicker').bootstrapMaterialDatePicker({ format: 'DD-MM-YYYY - HH:mm', clearButton: true, diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 0a089be7..18e16e8d 100644 --- 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({ diff --git a/app/views/settings/zones/_form.html.erb b/app/views/settings/zones/_form.html.erb index 5ae4132b..0c80e661 100755 --- a/app/views/settings/zones/_form.html.erb +++ b/app/views/settings/zones/_form.html.erb @@ -35,8 +35,3 @@ - \ No newline at end of file