Toasts submodule refactor

Author: nikitaeverywhere

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "source/client/js/AutoGrid"]
 	path = source/client/js/AutoGrid
 	url = [email protected]:ZitRos/AutoGrid.git
+[submodule "source/client/js/Toast"]
+	path = source/client/js/Toast
+	url = https://github.com/ZitRos/Toast.git

package.json

@@ -2,7 +2,7 @@
   "name": "cache-visual-editor",
   "printableName": "Cache Visual Editor",
   "packageName": "VisualEditor",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "description": "Visual class editor for InterSystems Caché",
   "main": "index.js",
   "keywords": [

source/client/js/Toast

@@ -84,7 +84,7 @@ export function getCodeCaptionView ({ memberManifest, codePropertyName, data, sa
             ROUTINE_SUPPORT = true;
         } else if (hasRoutineCode(value)) {
             useRoutinesToggle.checkbox.checked = true;
-            new Toast(Toast.TYPE_ERROR, `Code must not have routine definitions`);
+            new Toast(`Code must not have routine definitions`, Toast.TYPE_ERROR);
             return;
         } else {
             editor.setValue(switchToNoRoutineCode(value), curPos);

source/client/js/classEditor/class/code.js

@@ -172,7 +172,7 @@ function enableMember ({
             del.addEventListener(`click`, () => {
                 let delta = (-lastTimeDelClicked + (lastTimeDelClicked = (new Date()).getTime()));
                 if (delta > 5000) { // > 5 sec - show message "click again to delete"
-                    new Toast(Toast.TYPE_INFO, `Click again to delete`);
+                    new Toast(`Click again to delete`, Toast.TYPE_INFO);
                 } else { // delete
                     addChange(savePath.concat(`$delete`), true);
                     detach(headerElement);

source/client/js/classEditor/class/member.js

@@ -161,9 +161,9 @@ function saveButtonTrigger () {
 
         if (!res["error"]) {
             changeIsMade(false);
-            new Toast(Toast.TYPE_DONE, `Saved!`);
+            new Toast(`Saved!`, Toast.TYPE_DONE);
         } else {
-            new Toast(Toast.TYPE_ERROR, res["error"], Toast.TIME_LONG);
+            new Toast(res["error"], Toast.TYPE_ERROR, Toast.TIME_LONG);
         }
 
         // // REPLACES CLASS ON SAVE (temporary commented as side effects appear)

source/client/js/classEditor/index.js

@@ -5,7 +5,8 @@
 
 @import "domUtils";
 @import "icons";
-@import "toast/toast";
+@import "../js/Toast/default.scss";
+@import "toast";
 @import "basic";
 @import "autoGrid/cards";
 @import "classEditor/card";

source/client/scss/index.scss

@@ -1,24 +1,14 @@
-@import "../mixins";
-@import "../const";
+@import "mixins";
+@import "const";
 
 $messagesAlpha: .8;
 
 .toast {
 
-    position: fixed;
-    right: 0;
-    bottom: 0;
-    z-index: 10000;
-    @include transition(all .3s ease);
-
     > .body {
 
         font-size: $fontNormal;
-        margin: 1em;
-        padding: .5em;
         border-radius: $defaultPadding/2;
-        background: rgba(255, 255, 255, 0.8);
-        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
 
         &.info {
             background: rgba($colorP1, $messagesAlpha);
@@ -28,15 +18,9 @@ $messagesAlpha: .8;
 
             background: rgba($colorP4, $messagesAlpha);
 
-            > .icon {
-                color: white;
-            }
-
         }
 
         &.error {
-            color: white;
-            text-shadow: 0 0 1px black;
             background: rgba($colorP2, $messagesAlpha);
         }