From 6926ae21ffff15a7574159d928d6004dfafa3e5d Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Tue, 19 Jun 2018 11:40:52 +0800
Subject: [PATCH] Use swal to show error message when adding players

---
 resources/assets/src/js/__tests__/user.test.js |  4 ++--
 resources/assets/src/js/user/player.js         | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/assets/src/js/__tests__/user.test.js b/resources/assets/src/js/__tests__/user.test.js
index 7aefdee8..e83d7e6c 100644
--- a/resources/assets/src/js/__tests__/user.test.js
+++ b/resources/assets/src/js/__tests__/user.test.js
@@ -717,7 +717,7 @@ describe('tests for "player" module', () => {
     expect(document.getElementById('1')).toBeNull();
 
     await deletePlayer(1);
-    expect(toastr.warning).toBeCalledWith('warning');
+    expect(swal).toBeCalledWith({ type: 'warning', html: 'warning' });
 
     await deletePlayer(1);
     expect(showAjaxError).toBeCalled();
@@ -759,7 +759,7 @@ describe('tests for "player" module', () => {
     expect(modal).toBeCalled();
 
     await addNewPlayer();
-    expect(toastr.warning).toBeCalledWith('warning');
+    expect(swal).toBeCalledWith({ type: 'warning', html: 'warning' });
 
     await addNewPlayer();
     expect(showAjaxError).toBeCalled();
diff --git a/resources/assets/src/js/user/player.js b/resources/assets/src/js/user/player.js
index afe266ae..11f9c7a0 100644
--- a/resources/assets/src/js/user/player.js
+++ b/resources/assets/src/js/user/player.js
@@ -208,7 +208,7 @@ async function deletePlayer(pid) {
             });
             $(`tr#${pid}`).remove();
         } else {
-            toastr.warning(msg);
+            swal({ type: 'warning', html: msg });
         }
     } catch (error) {
         showAjaxError(error);
@@ -225,14 +225,12 @@ async function addNewPlayer() {
         });
 
         if (errno === 0) {
-            swal({
-                type: 'success',
-                html: msg
-            }).then(() => location.reload());
+            await swal({ type: 'success', html: msg });
 
             $('#modal-add-player').modal('hide');
+            location.reload();
         } else {
-            toastr.warning(msg);
+            swal({ type: 'warning', html: msg });
         }
     } catch (error) {
         showAjaxError(error);