From 48b0ef340d2f40e77957cf30eb0e104226344324 Mon Sep 17 00:00:00 2001
From: Maxim Stewart <maximstewart1@gmail.com>
Date: Fri, 19 Apr 2019 16:39:16 -0500
Subject: [PATCH] Added empty session alerts where needed.

---
 src/scripts/events.js         |  8 ++------
 src/scripts/sessionManager.js | 24 ++++++------------------
 src/scripts/utils.js          | 24 +++++++++---------------
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/scripts/events.js b/src/scripts/events.js
index 4fc279d..0338d87 100644
--- a/src/scripts/events.js
+++ b/src/scripts/events.js
@@ -20,9 +20,7 @@ document.addEventListener("click", (e) => {
                 else if (name == "edit")
                     editSession(selectedItem);
             } else {
-                swal("Select a session first...", {
-                    icon: "warning",
-                });
+                messageWindow("warning", "Select a session first...");
             }
         } else if (name == "save") {
             saveSession(selectedItem);
@@ -81,9 +79,7 @@ document.addEventListener("dblclick", (e) => {
                                 if (keysLength > 0) {
                                     loadSession(json, replaceTabs.checked);
                                 } else {
-                                    swal("Canceled operation; no tabs were selected...", {
-                                        icon: "warning",
-                                    });
+                                    messageWindow("warning", "Canceled operation; no tabs were selected...");
                                 }
                             }
                         });
diff --git a/src/scripts/sessionManager.js b/src/scripts/sessionManager.js
index aaf8e24..75c7c4c 100644
--- a/src/scripts/sessionManager.js
+++ b/src/scripts/sessionManager.js
@@ -46,14 +46,10 @@ const saveSession = (elm = null, message = "Session Name\nAllowed: a-z, A-Z, 0-9
                     sessionData = selectionData(container, keys, keysLength);
                     saveToStorage(enteryName, JSON.stringify(sessionData));
                 } else {
-                    swal("Canceled save...", {
-                        icon: "warning",
-                    });
+                    messageWindow("warning", "Canceled save...");
                 }
             } else {
-                swal("Canceled save...", {
-                    icon: "warning",
-                });
+                messageWindow("warning", "Canceled save...");
             }
         });
     });
@@ -122,14 +118,10 @@ const editSession = (elm = null, message = "Editing selected session...\nAllowed
                         }
                     }
                 } else {
-                    swal("Canceled edit...", {
-                        icon: "warning",
-                    });
+                    messageWindow("warning", "Canceled edit...");
                 }
             } else {
-                swal("Canceled edit...", {
-                    icon: "warning",
-                });
+                messageWindow("warning", "Canceled edit...");
             }
         });
     });
@@ -195,9 +187,7 @@ const loadSession = (json = null, replaceTabs = false) => {
 
                 if (replaceTabs) { // Clear all windows but main then load...
                     if (keysLength == 0) {
-                        swal("Canceled operation; no tabs in session...", {
-                            icon: "error",
-                        });
+                        messageWindow("error", "Canceled operation; no tabs in session...");
                         return ;
                     }
 
@@ -232,9 +222,7 @@ const loadSession = (json = null, replaceTabs = false) => {
                     if (keysLength == 1) {
                         windowMaker(0, keysLength, keys, json)
                     } else if (keysLength == 0) {
-                        swal("Canceled operation; no tabs in session...", {
-                            icon: "error",
-                        });
+                        messageWindow("error", "Canceled operation; no tabs in session...");
                     }
                 }
             });
diff --git a/src/scripts/utils.js b/src/scripts/utils.js
index 730bb79..a93061a 100644
--- a/src/scripts/utils.js
+++ b/src/scripts/utils.js
@@ -1,3 +1,7 @@
+const messageWindow = (type = "warning", message = "No message passed in...") => {
+    swal(message, { icon: type, });
+}
+
 const getSavedSessionIDs = () => {
     console.log("Getting saved sessions...");
     storage.get(null).then((storageResults) => {
@@ -48,19 +52,13 @@ const saveToStorage = (name, data, fromEdit = false) => {
         let json = null;
         try {
             json = JSON.parse(storageResults[name]);
-            swal("Overwrote session...", {
-                icon: "warning",
-            });
+            messageWindow("warning", "Overwrote session...");
         } catch (e) {
             if (fromEdit) {  // minor logic fix
-                swal("Overwrote session...", {
-                    icon: "warning",
-                });
+                messageWindow("warning", "Overwrote session...");
             } else {
                 appendToSavedSessionsList(name);
-                swal("Saved session...", {
-                    icon: "success",
-                });
+                messageWindow("success", "Saved session...");
             }
         } finally {
             storage.set({[name]: data});
@@ -81,13 +79,9 @@ const deleteFromStorage = (elm = null) => {
                 elm.parentElement.removeChild(elm);
             });
             selectedItem = null; // reset selectedItem
-            swal("Deleted session successfully...", {
-                icon: "success",
-            });
+            messageWindow("success", "Deleted session successfully...");
         } else {
-            swal("Canceled deletion...", {
-                icon: "warning",
-            });
+            messageWindow("warning", "Canceled deletion...");
         }
     });
 }