fixed conflic
This commit is contained in:
@@ -11,15 +11,15 @@
|
||||
// about supported directives.
|
||||
//
|
||||
//= require jquery
|
||||
//= require jquery.turbolinks
|
||||
//= require jquery_ujs
|
||||
//= require turbolinks
|
||||
//= require tether
|
||||
//= require bootstrap/js/popper.min
|
||||
//= require bootstrap/js/bootstrap-material-design.min
|
||||
//= require jquery_nested_form
|
||||
//= require cable
|
||||
//= require settings/processing_items
|
||||
//= require tether
|
||||
//= require bootstrap/js/popper.min
|
||||
//= require bootstrap/js/bootstrap-material-design.min
|
||||
//= require momentjs/moment
|
||||
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
|
||||
//= require multi-select/js/jquery.multi-select.js
|
||||
@@ -30,16 +30,24 @@
|
||||
//= require autosize/autosize.js
|
||||
//= require jquery-countto/jquery.countTo.js
|
||||
//= require raphael/raphael.min
|
||||
//= require morrisjs/morris.js
|
||||
//= require chartjs/Chart.bundle.js
|
||||
//= require fileinput.min
|
||||
//= 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,
|
||||
|
||||
Reference in New Issue
Block a user