diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e275d4a..4cebcdfc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +* **Build 214** (2015-03-03) + - Introduce `AjaxException` that allows response contents to be sent to framework.js and still be treated as an error. + * **Build 211** (2015-02-29) - Report Widgets now support the use of AJAX event handlers. diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 16b913389..75c787997 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -20,10 +20,10 @@ 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){if(!message)return -swal({title:message,type:'error',confirmButtonClass:'btn-default'}) +swal({title:message,confirmButtonClass:'btn-default'}) event.preventDefault()}) $(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()}) +swal({title:message,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)