Add workspace selector to bookmark edit panel and ensure ZenWorkspaces is defined

This commit is contained in:
mr. M
2025-03-08 23:59:38 +01:00
parent cf807ea93e
commit 163d2c8d8f
2 changed files with 6 additions and 7 deletions

View File

@@ -7,6 +7,7 @@ var ZenWorkspacesStorage = {
Weave: 'resource://services-sync/main.sys.mjs', Weave: 'resource://services-sync/main.sys.mjs',
}); });
if (!window.ZenWorkspaces) return;
await this._ensureTable(); await this._ensureTable();
await ZenWorkspaceBookmarksStorage.init(); await ZenWorkspaceBookmarksStorage.init();
}, },

View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/places/content/editBookmarkPanel.inc.xhtml b/browser/components/places/content/editBookmarkPanel.inc.xhtml diff --git a/browser/components/places/content/editBookmarkPanel.inc.xhtml b/browser/components/places/content/editBookmarkPanel.inc.xhtml
index 40366677b60123c66bf0739d1b2374b423d3061c..3e722dce6b21ab62535369f20afe5f0acd43838f 100644 index 40366677b60123c66bf0739d1b2374b423d3061c..a2774e99726407d95011126ea2a272f08eaf0961 100644
--- a/browser/components/places/content/editBookmarkPanel.inc.xhtml --- a/browser/components/places/content/editBookmarkPanel.inc.xhtml
+++ b/browser/components/places/content/editBookmarkPanel.inc.xhtml +++ b/browser/components/places/content/editBookmarkPanel.inc.xhtml
@@ -12,14 +12,15 @@ @@ -12,14 +12,15 @@
@@ -20,11 +20,10 @@ index 40366677b60123c66bf0739d1b2374b423d3061c..3e722dce6b21ab62535369f20afe5f0a
<label data-l10n-id="bookmark-overlay-location-2" <label data-l10n-id="bookmark-overlay-location-2"
class="editBMPanel_folderRow hideable" class="editBMPanel_folderRow hideable"
control="editBMPanel_folderMenuList"/> control="editBMPanel_folderMenuList"/>
@@ -47,7 +48,26 @@ @@ -47,7 +48,25 @@
class="expander-down panel-button" class="expander-down panel-button"
data-l10n-id="bookmark-overlay-folders-expander2"/> data-l10n-id="bookmark-overlay-folders-expander2"/>
</hbox> </hbox>
-
+ </hbox> + </hbox>
+ <hbox flex="1" class="zenEditBMPanel_fieldContainer"> + <hbox flex="1" class="zenEditBMPanel_fieldContainer">
+ <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector" + <label data-l10n-id="zen-bookmark-edit-panel-workspace-selector"
@@ -37,12 +36,11 @@ index 40366677b60123c66bf0739d1b2374b423d3061c..3e722dce6b21ab62535369f20afe5f0a
+ class="workspace-trigger">-</div> + class="workspace-trigger">-</div>
+ <button id="editBMPanel_workspacesSelectorExpander" + <button id="editBMPanel_workspacesSelectorExpander"
+ class="expander-down panel-button" + class="expander-down panel-button"
+ data-l10n-id="bookmark-overlay-tags-expander2" + data-l10n-id="bookmark-overlay-tags-expander2"/>
+ oncommand="gEditItemOverlay.onWorkspaceDropdownToggle();"/> +
+
+ </div> + </div>
+ </hbox> + </hbox>
+
+ <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true"> + <ul id="editBMPanel_workspaceList" class="workspace-list hideable" hidden="true">
+ </ul> + </ul>
<vbox id="editBMPanel_folderTreeRow" <vbox id="editBMPanel_folderTreeRow"