diff --git a/src/opnsense/mvc/app/views/OPNsense/Unbound/general.volt b/src/opnsense/mvc/app/views/OPNsense/Unbound/general.volt index 7cf055150..124903b1d 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Unbound/general.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Unbound/general.volt @@ -28,18 +28,15 @@ $( document ).ready(function() { var data_get_map = {'frm_GeneralSettings':"/api/unbound/settings/get"}; mapDataToFormUI(data_get_map).done(function(data) { - console.log(data); formatTokenizersUI(); $('.selectpicker').selectpicker({title: 'All (recommended)'}).selectpicker('render'); $('.selectpicker').selectpicker('refresh'); }); $("#reconfigureAct").SimpleActionButton({ - onPreAction: function() { + onPreAction: function () { const dfObj = new $.Deferred(); - saveFormToEndpoint("/api/unbound/settings/set", 'frm_GeneralSettings', function(){ - dfObj.resolve(); - }); + saveFormToEndpoint("/api/unbound/settings/set", 'frm_GeneralSettings', function () { dfObj.resolve(); }, false, function () { dfObj.reject(); }); return dfObj; } }); diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js index d4f4289b8..473702ff5 100644 --- a/src/opnsense/www/js/opnsense_ui.js +++ b/src/opnsense/www/js/opnsense_ui.js @@ -553,21 +553,21 @@ stdDialogRemoveItem.defaults = { * data-service-widget="service" (optional service widget to signal) * data-error-title="My error message" */ -$.fn.SimpleActionButton = function (params) { +$.fn.SimpleActionButton = function(params) { let this_button = this; - this.construct = function() { + this.construct = function () { let label_content = '' + this_button.data('label') + ' '; this_button.html(label_content); - this_button.on('click', function(){ + this_button.on('click', function () { this_button.find('.reload_progress').addClass("fa fa-spinner fa-pulse"); - let pre_action = function() { + let pre_action = function () { return (new $.Deferred()).resolve(); } if (params && params.onPreAction) { pre_action = params.onPreAction; } - pre_action().done(function() { - ajaxCall(this_button.data('endpoint'), {}, function(data,status) { + pre_action().done(function () { + ajaxCall(this_button.data('endpoint'), {}, function (data, status) { if (params && params.onAction) { params.onAction(data, status); } @@ -584,10 +584,13 @@ $.fn.SimpleActionButton = function (params) { updateServiceControlUI(this_button.data('service-widget')); } }); + }).fail(function () { + this_button.find('.reload_progress').removeClass("fa fa-spinner fa-pulse"); }); }); } - return this.each(function(){ + + return this.each(function (){ const button = this_button.construct(); return button; });