From 3c17e5b534e9a19cd8cf971ab53ec09cca605a89 Mon Sep 17 00:00:00 2001 From: Alper Ebicoglu Date: Thu, 13 Jun 2019 20:28:36 +0300 Subject: [PATCH 1/3] add abp.ui.setBusy with deferred promise --- .../freeze-ui/abp-freeze-ui.js | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/freeze-ui/abp-freeze-ui.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/freeze-ui/abp-freeze-ui.js index 309765a482..4fb8db1b3c 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/freeze-ui/abp-freeze-ui.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/freeze-ui/abp-freeze-ui.js @@ -3,7 +3,7 @@ if (!window.FreezeUI || !$) { return; } - + /* MESSAGE **************************************************/ /*Package from https://alexradulescu.github.io/freeze-ui/*/ @@ -26,7 +26,7 @@ /* UI BUSY */ abp.ui.setBusy = function (element, text, freezeDelay) { - var opt = { text : text ? text : ' ' }; + var opt = { text: text ? text : ' ' }; if (element) { opt.element = element; @@ -35,10 +35,35 @@ if (freezeDelay) { opt.freezeDelay = freezeDelay; } - + window.FreezeUI(opt); }; + abp.ui.setBusy = function (options) { + options = $.extend({}, options || { + freezeDelay: 500 + }); + + if (!options.text) { + options.text = " "; + } + + window.FreezeUI(options); + + if (options.promise) { + if (options.promise.always) { + options.promise.always(function () { + abp.ui.clearBusy(options.element); + }); + } else if (options.promise['finally']) { + options.promise['finally'](function () { + abp.ui.clearBusy(options.element); + }); + } + } + }; + + abp.ui.clearBusy = function () { window.UnFreezeUI(); }; From fc4ffdb24691a2bdf42977703478a8abd2e221e9 Mon Sep 17 00:00:00 2001 From: Xeevis Date: Tue, 18 Jun 2019 22:54:48 +0200 Subject: [PATCH 2/3] Refactor CliService.cs --- framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 551359bfb9..dd45adb94b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -40,7 +40,6 @@ namespace Volo.Abp.Cli public async Task RunAsync(string[] args) { Logger.LogInformation("ABP CLI (https://abp.io)"); - Logger.LogInformation("https://abp.io"); await CheckCliVersionAsync(); CheckDependencies(); @@ -191,6 +190,7 @@ namespace Volo.Abp.Cli case UpdateChannel.Nightly: return await NuGetService.GetLatestVersionOrNullAsync("Volo.Abp.Cli", includeNightly: true); + default: return default; } From f79c301d7bcf0382ac9135eb720de3c47ff5875a Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 19 Jun 2019 08:15:44 +0300 Subject: [PATCH 3/3] Update CliService.cs --- framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs index 551359bfb9..50aa1cd063 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs @@ -40,7 +40,6 @@ namespace Volo.Abp.Cli public async Task RunAsync(string[] args) { Logger.LogInformation("ABP CLI (https://abp.io)"); - Logger.LogInformation("https://abp.io"); await CheckCliVersionAsync(); CheckDependencies();