wombat/cocktailweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ModalComponent Show und Close-Funktionsnamen normiert

Browse Source
This commit is contained in:
BuildTools 2024-06-26 20:37:49 +02:00
parent 1e79620272
commit 8ccbe8cf65
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CocktailWeb/.config/dotnet-tools.json
View File

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"dotnet-ef": { "dotnet-ef": {
"version": "8.0.0", "version": "8.0.2",
"commands": [ "commands": [
"dotnet-ef" "dotnet-ef"
] ]

4
CocktailWeb/Pages/ModalComponent.razor
View File

@ -33,7 +33,7 @@
private string modalClass = ""; private string modalClass = "";
private bool showBackdrop = false; private bool showBackdrop = false;
public async Task OpenModal() public async Task ShowAsync()
{ {
modalDisplay = "block;"; modalDisplay = "block;";
await Task.Delay(100);//Delay allows bootstrap to perform nice fade animation await Task.Delay(100);//Delay allows bootstrap to perform nice fade animation
@ -41,7 +41,7 @@
showBackdrop = true; showBackdrop = true;
} }
public async Task Close() public async Task CloseAsync()
{ {
modalDisplay = "none"; modalDisplay = "none";
await Task.Delay(250);//Delay allows bootstrap to perform nice fade animation await Task.Delay(250);//Delay allows bootstrap to perform nice fade animation

5
CocktailWeb/Pages/Settings/Cocktails.razor
View File

@ -29,7 +29,6 @@
} }
</tbody> </tbody>
</table> </table>
</div> </div>
<ModalComponent @ref="modal"> <ModalComponent @ref="modal">
@ -67,13 +66,13 @@
private async Task ConfirmDelete(Cocktail c) private async Task ConfirmDelete(Cocktail c)
{ {
SelectedCocktail = c; SelectedCocktail = c;
await modal.OpenModal(); await modal.ShowAsync();
} }
private async Task CloseDialog() private async Task CloseDialog()
{ {
SelectedCocktail = null; SelectedCocktail = null;
await modal.Close(); await modal.CloseAsync();
} }
private async Task DeleteCocktail(MouseEventArgs e) private async Task DeleteCocktail(MouseEventArgs e)
{ {

6
CocktailWeb/Pages/Settings/Ingredients.razor
View File

@ -105,12 +105,12 @@
if (CocktailsWithIngredient.Count > 0) if (CocktailsWithIngredient.Count > 0)
{ {
InfoText = String.Join(", ", CocktailsWithIngredient.Select(c => c.Name).ToArray()); InfoText = String.Join(", ", CocktailsWithIngredient.Select(c => c.Name).ToArray());
await dlgInfo.OpenModal(); await dlgInfo.ShowAsync();
} }
else else
{ {
SelectedIngredient = fl; SelectedIngredient = fl;
await dlgDelete.OpenModal(); await dlgDelete.ShowAsync();
} }
} }
@ -133,6 +133,6 @@
private async Task CloseDialog(ModalComponent dlg) private async Task CloseDialog(ModalComponent dlg)
{ {
SelectedIngredient = null; SelectedIngredient = null;
await dlg.Close(); await dlg.CloseAsync();
} }
} }

4
CocktailWeb/Pages/Settings/Machine.razor.cs
View File

@ -35,7 +35,7 @@ namespace CocktailWeb.Pages.Settings
{ {
SelectedFiller = f; SelectedFiller = f;
SelectedFlasche = f.Flasche; SelectedFlasche = f.Flasche;
await modal.OpenModal(); await modal.ShowAsync();
} }
@ -63,7 +63,7 @@ namespace CocktailWeb.Pages.Settings
{ {
SelectedFiller = null; SelectedFiller = null;
SelectedFlasche = null; SelectedFlasche = null;
await modal.Close(); await modal.CloseAsync();
} }
} }
} }

4
CocktailWeb/Shared/TopRow.razor
View File

@ -104,14 +104,14 @@
private async Task OpenDialog() private async Task OpenDialog()
{ {
await Pwd_Dialog.OpenModal(); await Pwd_Dialog.ShowAsync();
} }
private async Task CloseDialog() private async Task CloseDialog()
{ {
Pwd_ErrorText = null; Pwd_ErrorText = null;
Pwd_inputPassword = null; Pwd_inputPassword = null;
await Pwd_Dialog.Close(); await Pwd_Dialog.CloseAsync();
} }