mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-05 17:36:34 +00:00
Add workspace selector to bookmark edit panel and ensure ZenWorkspaces is defined
This commit is contained in:
@@ -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();
|
||||||
},
|
},
|
||||||
|
@@ -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"
|
||||||
|
Reference in New Issue
Block a user