Fixed previous merges

src/browser/base/content/ZenUIManager.mjs

@@ -18,10 +18,6 @@ var gZenUIManager = {
       return document.getElementById('zen-toast-container');
     });
 
-    ChromeUtils.defineLazyGetter(this, '_toastContainer', () => {
-      return document.getElementById('zen-toast-container');
-    });
-
     new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
@@ -249,38 +245,6 @@ var gZenUIManager = {
       this._toastContainer.setAttribute('hidden', 'true');
     }
   },
-
-  // Section: Notification messages
-  _createToastElement(messageId, options) {
-    const element = document.createXULElement('vbox');
-    const label = document.createXULElement('label');
-    document.l10n.setAttributes(label, messageId, options);
-    element.appendChild(label);
-    if (options.descriptionId) {
-      const description = document.createXULElement('label');
-      description.classList.add('description');
-      document.l10n.setAttributes(description, options.descriptionId, options);
-      element.appendChild(description);
-    }
-    element.classList.add('zen-toast');
-    return element;
-  },
-
-  async showToast(messageId, options = {}) {
-    const toast = this._createToastElement(messageId, options);
-    this._toastContainer.removeAttribute('hidden');
-    this._toastContainer.appendChild(toast);
-    await this.motion.animate(toast, { opacity: [0, 1], scale: [0.8, 1] }, { type: 'spring', duration: 0.3 });
-    await new Promise((resolve) => setTimeout(resolve, 3000));
-    await this.motion.animate(toast, { opacity: [1, 0], scale: [1, 0.9] }, { duration: 0.2, bounce: 0 });
-    const toastHeight = toast.getBoundingClientRect().height;
-    // 5 for the separation between toasts
-    await this.motion.animate(toast, { marginBottom: [0, `-${toastHeight + 5}px`] }, { duration: 0.2 });
-    toast.remove();
-    if (!this._toastContainer.hasChildNodes()) {
-      this._toastContainer.setAttribute('hidden', 'true');
-    }
-  },
 };
 
 var gZenVerticalTabsManager = {
@@ -325,14 +289,6 @@ var gZenVerticalTabsManager = {
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
-  openNewTabOnTabsMiddleClick(event) {
-    if (event.button === 1 && event.target.id === 'tabbrowser-tabs' && this.canOpenTabOnMiddleClick) {
-      document.getElementById('cmd_newNavigatorTabNoEvent').doCommand();
-      event.stopPropagation();
-      event.preventDefault();
-    }
-  },
-
   toggleExpand() {
     const newVal = !Services.prefs.getBoolPref('zen.view.sidebar-expanded');
     Services.prefs.setBoolPref('zen.view.sidebar-expanded', newVal);
@@ -777,85 +733,4 @@ var gZenVerticalTabsManager = {
 
     this._tabEdited = null;
   },
-
-  renameTabKeydown(event) {
-    if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector('.tab-label-container-editing');
-      let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value.trim();
-
-      // Check if name is blank, reset if so
-      // Always remove, so we can always rename and if it's empty,
-      // it will reset to the original name anyway
-      this._tabEdited.removeAttribute('zen-has-static-label');
-      if (newName) {
-        gBrowser._setTabLabel(this._tabEdited, newName);
-        this._tabEdited.setAttribute('zen-has-static-label', 'true');
-      } else {
-        gBrowser.setTabTitle(this._tabEdited);
-      }
-
-      // Maybe add some confetti here?!?
-      gZenUIManager.motion.animate(
-        this._tabEdited,
-        {
-          scale: [1, 0.98, 1],
-        },
-        {
-          duration: 0.25,
-        }
-      );
-
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.classList.remove('tab-label-container-editing');
-
-      this._tabEdited = null;
-    } else if (event.key === 'Escape') {
-      event.target.blur();
-    }
-  },
-
-  renameTabStart(event) {
-    if (
-      this._tabEdited ||
-      !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
-      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
-      !gZenVerticalTabsManager._prefsSidebarExpanded
-    )
-      return;
-    this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited || !this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) {
-      this._tabEdited = null;
-      return;
-    }
-    const label = this._tabEdited.querySelector('.tab-label-container');
-    label.classList.add('tab-label-container-editing');
-
-    const container = window.MozXULElement.parseXULToFragment(`
-      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
-    `);
-    label.after(container);
-    const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
-    const input = document.createElement('input');
-    input.id = 'tab-label-input';
-    input.value = this._tabEdited.label;
-    input.addEventListener('keydown', this.renameTabKeydown.bind(this));
-
-    containerHtml.appendChild(input);
-    input.focus();
-    input.select();
-
-    input.addEventListener('blur', this._renameTabHalt);
-  },
-
-  renameTabHalt(event) {
-    if (document.activeElement === event.target || !this._tabEdited) {
-      return;
-    }
-    this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector('.tab-label-container-editing');
-    label.classList.remove('tab-label-container-editing');
-
-    this._tabEdited = null;
-  },
 };

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -325,9 +325,6 @@
       top: 0px;
       right: 0px;
       --tab-collapsed-width: 34px;
-      top: 0px;
-      right: 0px;
-      --tab-collapsed-width: 34px;
       --tab-min-height: 16px;
       width: var(--tab-collapsed-width) !important;
       z-index: 1;
@@ -337,11 +334,6 @@
         background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
         border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
       }
-      & .tab-background {
-        /* Solid colors because we don't want to show the background */
-        background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
-        border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
-      }
     }
   }
 }
@@ -963,7 +955,6 @@
   padding: 0;
 }
 
-#zen-essentials-container > .tabbrowser-tab {
 #zen-essentials-container > .tabbrowser-tab {
   --toolbarbutton-inner-padding: 0;
   max-width: unset;
@@ -1004,7 +995,6 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[visuallyselected] > .tab-stack > .tab-background {
     &[visuallyselected] > .tab-stack > .tab-background {
       &::after {
         content: "";
@@ -1149,7 +1139,7 @@
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
 
-/* Renaming tab */
+/* Renaming tabs */
 .tab-label-container-editing {
   display: none !important;
 }