Integrate Weave service into ZenWorkspacesStorage and update bookmarkProperties.xhtml for localization and styling

This commit is contained in:
mr. M
2025-01-01 19:42:48 +01:00
parent 533533b639
commit 72a7a6b3c8
2 changed files with 9 additions and 7 deletions

View File

@@ -4,6 +4,7 @@ var ZenWorkspacesStorage = {
async init() {
ChromeUtils.defineESModuleGetters(this.lazy, {
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
Weave: "resource://services-sync/main.sys.mjs",
});
await this._ensureTable();
@@ -65,11 +66,10 @@ var ZenWorkspacesStorage = {
CREATE INDEX IF NOT EXISTS idx_zen_workspaces_changes_uuid ON zen_workspaces_changes(uuid)
`);
if (!Weave.Service.engineManager.get('workspaces')) {
Weave.Service.engineManager.register(ZenWorkspacesEngine);
if (!this.lazy.Weave.Service.engineManager.get('workspaces')) {
this.lazy.Weave.Service.engineManager.register(ZenWorkspacesEngine);
await ZenWorkspacesStorage.migrateWorkspacesFromJSON();
}
});
},

View File

@@ -1,20 +1,22 @@
diff --git a/browser/components/places/content/bookmarkProperties.xhtml b/browser/components/places/content/bookmarkProperties.xhtml
index 047652a52e705d49f870399992873fce536c07b9..8bc7d1c5e44c33d90f82fdc6f66d9e2e80c60bae 100644
index 047652a52e705d49f870399992873fce536c07b9..37ea726fe427a31db8fae97c99fd38c8669fa0f9 100644
--- a/browser/components/places/content/bookmarkProperties.xhtml
+++ b/browser/components/places/content/bookmarkProperties.xhtml
@@ -37,6 +37,7 @@
@@ -37,6 +37,8 @@
/>
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
+ <script src="chrome://browser/content/zenThemeModifier.js"></script>
+ <html:link rel="localization" href="browser/zen-workspaces.ftl"/>
+ <html:link rel="stylesheet" href="chrome://browser/content/zen-styles/zen-popup.css" />
</linkset>
<stringbundleset id="stringbundleset">
@@ -44,6 +45,7 @@
@@ -44,6 +46,8 @@
src="chrome://browser/locale/places/bookmarkProperties.properties"/>
</stringbundleset>
+ <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
+ <script src="chrome://browser/content/zenThemeModifier.js"></script>
<script src="chrome://browser/content/places/editBookmark.js"/>
<script src="chrome://browser/content/places/bookmarkProperties.js"/>
<script src="chrome://global/content/globalOverlay.js"/>