custom widget launchers should not be initialized in safe mode

zadam · Dec 24, 2022 · 4c51588 · 4c51588
1 parent b13ea72
commit 4c51588
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/src/public/app/widgets/containers/launcher.js b/src/public/app/widgets/containers/launcher.js
@@ -37,6 +37,10 @@ export default class LauncherWidget extends BasicWidget {
 
         const launcherType = note.getLabelValue("launcherType");
 
+        if (glob.TRILIUM_SAFE_MODE && launcherType === 'customWidget') {
+            return false;
+        }
+
         if (launcherType === 'command') {
             this.innerWidget = this.initCommandLauncherWidget(note)
                 .class("launcher-button");

diff --git a/src/public/app/widgets/containers/launcher_container.js b/src/public/app/widgets/containers/launcher_container.js
@@ -27,22 +27,19 @@ export default class LauncherContainer extends FlexContainer {
             return;
         }
 
-        await Promise.allSettled(
-            (await visibleLaunchersRoot.getChildNotes())
-                .map(async launcherNote => {
-                    try {
-                        const launcherWidget = new LauncherWidget();
-                        const success = await launcherWidget.initLauncher(launcherNote);
-
-                        if (success) {
-                            this.child(launcherWidget);
-                        }
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                })
-        );
+        for (const launcherNote of await visibleLaunchersRoot.getChildNotes()) {
+            try {
+                const launcherWidget = new LauncherWidget();
+                const success = await launcherWidget.initLauncher(launcherNote);
+
+                if (success) {
+                    this.child(launcherWidget);
+                }
+            }
+            catch (e) {
+                console.error(e);
+            }
+        }
 
         this.$widget.empty();
         this.renderChildren();

diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs
@@ -35,7 +35,8 @@
         extraHoistedNoteId: '<%= extraHoistedNoteId %>',
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         triliumVersion: "<%= triliumVersion %>",
-        assetPath: "<%= assetPath %>"
+        assetPath: "<%= assetPath %>",
+        TRILIUM_SAFE_MODE: <%= !!process.env.TRILIUM_SAFE_MODE %>
     };
 </script>
 

diff --git a/src/views/mobile.ejs b/src/views/mobile.ejs
@@ -117,7 +117,8 @@
         appCssNoteIds: <%- JSON.stringify(appCssNoteIds) %>,
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         assetPath: "<%= assetPath %>",
-        isMainWindow: true
+        isMainWindow: true,
+        TRILIUM_SAFE_MODE: <%= !!process.env.TRILIUM_SAFE_MODE %>
     };
 </script>