ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-07 20:39:59 +02:00
Code Releases Wiki Activity

Discard changes to src/zen/common/ZenUIManager.mjs

Browse source
This commit is contained in:
mr. m 2025-05-25 13:13:27 +02:00 • committed by GitHub
parent 3724f2a759
commit 11a671be05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/zen/common/ZenUIManager.mjs
View file

@ -989,18 +989,10 @@ var gZenVerticalTabsManager = {
async renameTabKeydown(event) { async renameTabKeydown(event) {
event.stopPropagation(); event.stopPropagation();
if (event.key === 'Enter') { if (event.key === 'Enter') {
const isTab = !!event.target.closest('.tabbrowser-tab'); let label = this._tabEdited.querySelector('.tab-label-container-editing');
let label = isTab let input = this._tabEdited.querySelector('#tab-label-input');
? this._tabEdited.querySelector('.tab-label-container-editing')
: this._tabEdited;
let input = document.getElementById('tab-label-input');
let newName = input.value.trim(); let newName = input.value.trim();
document.documentElement.removeAttribute('zen-renaming-tab');
input.remove();
if (!isTab) {
await this._tabEdited.onRenameFinished(newName);
} else {
// Check if name is blank, reset if so // Check if name is blank, reset if so
// Always remove, so we can always rename and if it's empty, // Always remove, so we can always rename and if it's empty,
// it will reset to the original name anyway // it will reset to the original name anyway
@ -1020,6 +1012,7 @@ var gZenVerticalTabsManager = {
!!newName !!newName
); );
} }
document.documentElement.removeAttribute('zen-renaming-tab');
// Maybe add some confetti here?!? // Maybe add some confetti here?!?
gZenUIManager.motion.animate( gZenUIManager.motion.animate(
@ -1031,12 +1024,8 @@ var gZenVerticalTabsManager = {
duration: 0.25, duration: 0.25,
} }
); );
}
const editorContainer = this._tabEdited.querySelector('.tab-editor-container'); this._tabEdited.querySelector('.tab-editor-container').remove();
if (editorContainer) {
editorContainer.remove();
}
label.classList.remove('tab-label-container-editing'); label.classList.remove('tab-label-container-editing');
this._tabEdited = null; this._tabEdited = null;
@ -1046,45 +1035,34 @@ var gZenVerticalTabsManager = {
}, },
renameTabStart(event) { renameTabStart(event) {
const isTab = !!event.target.closest('.tabbrowser-tab');
if ( if (
this._tabEdited || this._tabEdited ||
((!Services.prefs.getBoolPref('zen.tabs.rename-tabs') || !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')) && Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
isTab) ||
!gZenVerticalTabsManager._prefsSidebarExpanded !gZenVerticalTabsManager._prefsSidebarExpanded
) )
return; return;
this._tabEdited = this._tabEdited = event.target.closest('.tabbrowser-tab');
event.target.closest('.tabbrowser-tab') ||
event.target.closest('.zen-current-workspace-indicator-name') ||
gZenWorkspaces.activeWorkspaceIndicator.querySelector(
'.zen-current-workspace-indicator-name'
);
if ( if (
!this._tabEdited || !this._tabEdited ||
((!this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) && isTab) !this._tabEdited.pinned ||
this._tabEdited.hasAttribute('zen-essential')
) { ) {
this._tabEdited = null; this._tabEdited = null;
return; return;
} }
event.stopPropagation();
document.documentElement.setAttribute('zen-renaming-tab', 'true'); document.documentElement.setAttribute('zen-renaming-tab', 'true');
const label = isTab ? this._tabEdited.querySelector('.tab-label-container') : this._tabEdited; const label = this._tabEdited.querySelector('.tab-label-container');
label.classList.add('tab-label-container-editing'); label.classList.add('tab-label-container-editing');
if (isTab) {
const container = window.MozXULElement.parseXULToFragment(` const container = window.MozXULElement.parseXULToFragment(`
<vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox> <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
`); `);
label.after(container); label.after(container);
} const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
const containerHtml = isTab
? this._tabEdited.querySelector('.tab-editor-container')
: this._tabEdited.parentNode;
const input = document.createElement('input'); const input = document.createElement('input');
input.id = 'tab-label-input'; input.id = 'tab-label-input';
input.value = isTab ? this._tabEdited.label : this._tabEdited.textContent; input.value = this._tabEdited.label;
input.addEventListener('keydown', this.renameTabKeydown.bind(this)); input.addEventListener('keydown', this.renameTabKeydown.bind(this));
containerHtml.appendChild(input); containerHtml.appendChild(input);
@ -1099,16 +1077,8 @@ var gZenVerticalTabsManager = {
return; return;
} }
document.documentElement.removeAttribute('zen-renaming-tab'); document.documentElement.removeAttribute('zen-renaming-tab');
const editorContainer = this._tabEdited.querySelector('.tab-editor-container'); this._tabEdited.querySelector('.tab-editor-container').remove();
let input = document.getElementById('tab-label-input'); const label = this._tabEdited.querySelector('.tab-label-container-editing');
input.remove();
if (editorContainer) {
editorContainer.remove();
}
const isTab = !!this._tabEdited.closest('.tabbrowser-tab');
const label = isTab
? this._tabEdited.querySelector('.tab-label-container-editing')
: this._tabEdited;
label.classList.remove('tab-label-container-editing'); label.classList.remove('tab-label-container-editing');
this._tabEdited = null; this._tabEdited = null;