diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index e405de201..16b913389 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -19,9 +19,11 @@ return' '+state.text return state.text} $('select.custom-select:not([data-no-auto-update-on-render=true])').select2({formatResult:formatSelectOption,formatSelection:formatSelectOption,escapeMarkup:function(m){return m;}})}) $(document).on('disable','select.custom-select',function(event,status){$(this).select2('enable',!status)}) -$(document).on('focus','select.custom-select',function(event){setTimeout($.proxy(function(){$(this).select2('focus')},this),10)})})(jQuery);$(window).on('ajaxErrorMessage',function(event,message){swal({title:message,confirmButtonClass:'btn-default'}) +$(document).on('focus','select.custom-select',function(event){setTimeout($.proxy(function(){$(this).select2('focus')},this),10)})})(jQuery);$(window).on('ajaxErrorMessage',function(event,message){if(!message)return +swal({title:message,type:'error',confirmButtonClass:'btn-default'}) event.preventDefault()}) -$(window).on('ajaxConfirmMessage',function(event,message){swal({title:message,showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()}) +$(window).on('ajaxConfirmMessage',function(event,message){if(!message)return +swal({title:message,type:'error',showCancelButton:true,confirmButtonClass:'btn-primary'},function(isConfirm){isConfirm?event.promise.resolve():event.promise.reject()}) event.preventDefault() return true}) function backendUrl(url){if(typeof backendBasePath==='undefined'||!backendBasePath) diff --git a/modules/backend/assets/js/october.utils.js b/modules/backend/assets/js/october.utils.js index 2daacf752..3d40fa94f 100644 --- a/modules/backend/assets/js/october.utils.js +++ b/modules/backend/assets/js/october.utils.js @@ -7,6 +7,7 @@ */ $(window).on('ajaxErrorMessage', function(event, message){ + if (!message) return swal({ title: message, @@ -16,17 +17,18 @@ $(window).on('ajaxErrorMessage', function(event, message){ // Prevent the default alert() message event.preventDefault() - }) $(window).on('ajaxConfirmMessage', function(event, message){ + if (!message) return swal({ title: message, // type: 'warning', showCancelButton: true, confirmButtonClass: 'btn-primary' - }, function(isConfirm){ + }, + function(isConfirm){ isConfirm ? event.promise.resolve() : event.promise.reject() @@ -35,7 +37,6 @@ $(window).on('ajaxConfirmMessage', function(event, message){ // Prevent the default confirm() message event.preventDefault() return true - }) /*