ZenBrowserMirrors/components
1
0
Fork 0
mirror of https://github.com/zen-browser/components.git synced 2025-07-08 05:49:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor ZenWorkspaces.mjs to fix parsing of workspace icons and improve workspace creation

Browse source 
- Refactor ZenWorkspaces.mjs to fix parsing of workspace icons and ensure compatibility with icons that have more than one character.
- Improve workspace creation by displaying the first character of each icon and adding container information.
This commit is contained in:
mauro-balades 2024-09-11 22:54:17 +02:00
parent 014161404d
commit b372ec2694
1 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/ZenWorkspaces.mjs
View file

@ -100,7 +100,9 @@ var ZenWorkspaces = {
}
},
_kIcons: JSON.parse(Services.prefs.getStringPref("zen.workspaces.icons")),
// Convert all the icons to just the first character, just in case someone
// decides to use a string with more than one character
_kIcons: JSON.parse(Services.prefs.getStringPref("zen.workspaces.icons")).map((icon) => icon[0]),
_initializeWorkspaceCreationIcons() {
let container = document.getElementById('PanelUI-zen-workspaces-create-icons-container');
@ -231,12 +233,31 @@ var ZenWorkspaces = {
element.className = 'subviewbutton';
element.setAttribute('tooltiptext', workspace.name);
element.setAttribute('zen-workspace-id', workspace.uuid);
//element.setAttribute("context", "zenWorkspaceActionsMenu");
if (workspace.used) {
element.setAttribute('active', 'true');
}
if (workspace.default) {
element.setAttribute('default', 'true');
}
console.log(ContextualIdentityService.getPublicIdentities())
console.log(workspace)
const containerGroup = ContextualIdentityService.getPublicIdentities().find(
(container) => container.userContextId === workspace.containerTabId
);
console.log(containerGroup)
if (containerGroup) {
element.classList.add("identity-color-" + containerGroup.color);
element.setAttribute("data-usercontextid", containerGroup.userContextId);
}
let childs = window.MozXULElement.parseXULToFragment(`
<div class="zen-workspace-icon">
</div>
<div class="zen-workspace-name">
</div>
<vbox>
<div class="zen-workspace-name">
</div>
<div class="zen-workspace-container" ${containerGroup ? '' : 'hidden="true"'}>
</div>
</vbox>
<toolbarbutton closemenu="none" class="toolbarbutton-1 zen-workspace-actions">
<image class="toolbarbutton-icon" id="zen-workspace-actions-menu-icon"></image>
</toolbarbutton>
@ -245,6 +266,11 @@ var ZenWorkspaces = {
// use text content instead of innerHTML to avoid XSS
childs.querySelector('.zen-workspace-icon').textContent = this.getWorkspaceIcon(workspace);
childs.querySelector('.zen-workspace-name').textContent = workspace.name;
if (containerGroup) {
childs.querySelector('.zen-workspace-container').textContent = ContextualIdentityService.formatContextLabel(
containerGroup.l10nId
);
}
childs.querySelector('.zen-workspace-actions').addEventListener('command', (event) => {
let button = event.target;
@ -587,6 +613,7 @@ var ZenWorkspaces = {
);
workspace.containerTabId = userContextId;
await this.saveWorkspace(workspace);
await this._propagateWorkspaceData();
},
onContextMenuClose() {