@nebularstreams/libmui 2.5.22 → 2.5.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/util/widgets.js +61 -54
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@nebularstreams/libmui",
3
3
  "description": "Micro UI based on Mithril",
4
- "version": "2.5.22",
4
+ "version": "2.5.24",
5
5
  "type": "module",
6
6
  "main": "src/index.js",
7
7
  "scripts": {
package/src/util/widgets.js CHANGED
@@ -1,72 +1,79 @@
1
1
  import m from "mithril";
2
2
 
3
3
  let
4
- mCurrentCancelable;
4
+ mCurrentCancelable;
5
5
 
6
6
  function runCancelable(container) {
7
- if (typeof mCurrentCancelable === "function") {
8
- mCurrentCancelable();
9
- mCurrentCancelable = undefined;
10
- }
11
- container.style.display = "none";
12
- delete popupMessage.redraw;
7
+ if (typeof mCurrentCancelable === "function") {
8
+ mCurrentCancelable();
9
+ mCurrentCancelable = undefined;
10
+ }
11
+ if (popupMessage.redraw) {
12
+ popupMessage.redraw(true);
13
+ delete popupMessage.redraw;
14
+ }
15
+ container.style.display = "none";
13
16
  }
14
17
 
18
+
15
19
  // There are ways of doing this inside m.route but it is probably
16
20
  // cleaner and faster when kept outside of the main auto
17
21
  // rendering system
18
22
 
19
23
  function popupMessage(message, cancelable = false, contentClass = ".modal-content") {
20
24
 
21
- const container = document.getElementById("modal-container");
22
- container.classList.toggle("iscustom", contentClass !== ".modal-content");
23
-
24
- if (cancelable) {
25
-
26
- mCurrentCancelable = cancelable;
27
-
28
- container.onclick = (event) => {
29
- if (event.target.id === "modal-container") {
30
- runCancelable(container);
31
- }
32
- };
33
- }
34
-
35
- if (!message) {
36
- delete popupMessage.redraw;
37
- if (message === null)
38
- container.style.display = "none";
39
- else
40
- runCancelable(container);
41
-
42
- return;
43
- }
44
-
45
- container.style.display = "flex";
46
-
47
- popupMessage.redraw = () => {
48
- m.render(
49
- container,
50
- m(contentClass, {
51
- role: "alertdialog",
52
- "aria-labelledby": "modaltitle",
53
- "aria-modal": true
54
- }, [
55
- typeof message === "function" ? message() : message
56
- ])
57
- );
58
- };
59
-
60
- popupMessage.redraw();
25
+ const container = document.getElementById("modal-container");
26
+ container.classList.toggle("iscustom", contentClass !== ".modal-content");
27
+
28
+ if (cancelable) {
29
+
30
+ mCurrentCancelable = cancelable;
31
+
32
+ container.onclick = (event) => {
33
+ if (event.target.id === "modal-container") {
34
+ runCancelable(container);
35
+ }
36
+ };
37
+ }
38
+
39
+ if (!message) {
40
+
41
+ if (popupMessage.redraw) {
42
+ popupMessage.redraw(true);
43
+ delete popupMessage.redraw;
44
+ }
45
+ if (message === null)
46
+ container.style.display = "none";
47
+ else
48
+ runCancelable(container);
49
+
50
+ return;
51
+ }
52
+
53
+ container.style.display = "flex";
54
+
55
+ popupMessage.redraw = (remove) => {
56
+ m.render(
57
+ container,
58
+ m(contentClass, {
59
+ role: "alertdialog",
60
+ "aria-labelledby": "modaltitle",
61
+ "aria-modal": true
62
+ }, remove || !message ? [] : [
63
+ typeof message === "function" ? message() : message
64
+ ])
65
+ );
66
+ };
67
+ popupMessage.redraw();
61
68
  }
62
69
 
63
70
  function clearModal() {
64
- const container = document.getElementById("modal-container");
65
- if (container.style.display !== "none") {
66
- runCancelable(container);
67
- return true;
68
- }
69
- return false;
71
+ const container = document.getElementById("modal-container");
72
+ if (container.style.display !== "none") {
73
+ runCancelable(container);
74
+ return true;
75
+ }
76
+ return false;
70
77
  }
71
78
 
72
- export { popupMessage, clearModal };
79
+ export {popupMessage, clearModal};