@nebularstreams/libmui 2.5.21 → 2.5.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nebularstreams/libmui",
   "description": "Micro UI based on Mithril",
-  "version": "2.5.21",
+  "version": "2.5.23",
   "type": "module",
   "main": "src/index.js",
   "scripts": {

package/src/util/colorjoe.js

@@ -1,6 +1,7 @@
 /*! colorjoe - v4.1.1 - Juho Vepsalainen <bebraw@gmail.com> - MIT
 https://bebraw.github.com/colorjoe - 2020-01-27 */
-const factory = (function () {
+const
+    factory = (function () {
         "use strict";
 
         var commonjsGlobal = typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
@@ -1366,4 +1367,4 @@ const factory = (function () {
     }),
     colorjoe = factory();
 
-export default factory;
+export default colorjoe;

package/src/util/widgets.js

@@ -1,72 +1,75 @@
 import m from "mithril";
 
 let
-	mCurrentCancelable;
+    mCurrentCancelable;
 
 function runCancelable(container) {
-	if (typeof mCurrentCancelable === "function") {
-		mCurrentCancelable();
-		mCurrentCancelable = undefined;
-	}
-	container.style.display = "none";
-	delete popupMessage.redraw;
+    if (typeof mCurrentCancelable === "function") {
+        mCurrentCancelable();
+        mCurrentCancelable = undefined;
+    }
+    popupMessage.redraw(true);
+    container.style.display = "none";
+    delete popupMessage.redraw;
 }
 
+
 // There are ways of doing this inside m.route but it is probably
 // cleaner and faster when kept outside of the main auto
 // rendering system
 
 function popupMessage(message, cancelable = false, contentClass = ".modal-content") {
 
-	const container = document.getElementById("modal-container");
-	container.classList.toggle("iscustom", contentClass !== ".modal-content");
-
-	if (cancelable) {
-
-		mCurrentCancelable = cancelable;
-
-		container.onclick = (event) => {
-			if (event.target.id === "modal-container") {
-				runCancelable(container);
-			}
-		};
-	}
-
-	if (!message) {
-		delete popupMessage.redraw;
-		if (message === null)
-			container.style.display = "none";
-		else
-			runCancelable(container);
-
-		return;
-	}
-
-	container.style.display = "flex";
-
-	popupMessage.redraw = () => {
-		m.render(
-			container,
-			m(contentClass, {
-				role: "alertdialog",
-				"aria-labelledby": "modaltitle",
-				"aria-modal": true
-			}, [
-				typeof message === "function" ? message() : message
-			])
-		);
-	};
-
-	popupMessage.redraw();
+    const container = document.getElementById("modal-container");
+    container.classList.toggle("iscustom", contentClass !== ".modal-content");
+
+    if (cancelable) {
+
+        mCurrentCancelable = cancelable;
+
+        container.onclick = (event) => {
+            if (event.target.id === "modal-container") {
+                runCancelable(container);
+            }
+        };
+    }
+
+    if (!message) {
+
+        popupMessage.redraw(true);
+        delete popupMessage.redraw;
+        if (message === null)
+            container.style.display = "none";
+        else
+            runCancelable(container);
+
+        return;
+    }
+
+    container.style.display = "flex";
+
+    popupMessage.redraw = (remove) => {
+        m.render(
+            container,
+            m(contentClass, {
+                role: "alertdialog",
+                "aria-labelledby": "modaltitle",
+                "aria-modal": true
+            }, remove || !message ? [] : [
+                typeof message === "function" ? message() : message
+            ])
+        );
+    };
+    popupMessage.redraw();
 }
 
 function clearModal() {
-	const container = document.getElementById("modal-container");
-	if (container.style.display !== "none") {
-		runCancelable(container);
-		return true;
-	}
-	return false;
+    const container = document.getElementById("modal-container");
+    if (container.style.display !== "none") {
+        runCancelable(container);
+        return true;
+    }
+    return false;
 }
 
-export { popupMessage, clearModal };
+export {popupMessage, clearModal};