Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

src/browser/app/profile/zen-browser.js

@@ -178,7 +178,7 @@ pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');
 
 // TODO: Check this out!
-pref("browser.profiles.enabled", true);
+pref("browser.profiles.enabled", false);
 
 // Zen webpanels (calling it sidebar due to legacy reasons)
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikipedia.org/\"\n  },\n\"p2\":{\n   \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n   \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n   \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");

src/browser/base/zen-components/ZenPinnedTabManager.mjs

@@ -82,11 +82,9 @@
     }
 
     onTabIconChanged(tab, url = null) {
-      if (tab.hasAttribute('zen-essential') && this._pinsCache) {
-        const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
-        if (pin) {
-          tab.querySelector('.tab-background').style.setProperty('--zen-tab-icon', `url(${pin.iconUrl})`);
-        }
+      const iconUrl = url ?? tab.iconImage.src;
+      if (tab.hasAttribute('zen-essential')) {
+        tab.querySelector('.tab-background').style.setProperty('--zen-tab-icon', `url(${iconUrl})`);
       }
       // TODO: work on this
       //if (tab.hasAttribute('zen-pinned-changed') || !this._pinsCache) {

src/browser/base/zen-components/ZenViewSplitter.mjs

@@ -210,10 +210,10 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     if (!(event.clientX < panelsRect.left + panelsWidth / 4 || event.clientX > panelsRect.left + (panelsWidth / 4) * 3)) {
       return;
     }
+    dt.mozCursor = 'default';
     const oldTab = this._lastOpenedTab;
     this._canDrop = true;
-    // wait some time before showing the split view
-    this._showSplitViewTimeout = setTimeout(() => {
+    {
       this._draggingTab = draggedTab;
       gBrowser.selectedTab = oldTab;
       this._hasAnimated = true;
@@ -225,6 +225,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       const side = event.clientX > halfWidth ? 'right' : 'left';
       this.fakeBrowser = document.createXULElement('vbox');
       this.fakeBrowser.addEventListener('dragleave', this.onBrowserDragEndToSplit);
+      window.addEventListener('dragend', this.onBrowserDragEndToSplit, { once: true });
       const padding = Services.prefs.getIntPref('zen.theme.content-element-separation', 0);
       this.fakeBrowser.setAttribute('flex', '1');
       this.fakeBrowser.id = 'zen-split-view-fake-browser';
@@ -271,7 +272,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
           draggedTab._visuallySelected = true;
         });
       }
-    }, 100);
+    }
   }
 
   onBrowserDragEndToSplit(event) {
@@ -291,9 +292,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     ) {
       return;
     }
-    if (this._showSplitViewTimeout) {
-      clearTimeout(this._showSplitViewTimeout);
-    }
     if (!this._hasAnimated || !this.fakeBrowser) {
       return;
     }

src/browser/base/zen-components/ZenWorkspaces.mjs

@@ -1405,15 +1405,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   _deleteAllTabsInWorkspace(workspaceID) {
-    for (let tab of this.allStoredTabs) {
-      if (tab.getAttribute('zen-workspace-id') === workspaceID) {
-        gBrowser.removeTab(tab, {
-          animate: false,
-          skipSessionStore: true,
-          closeWindowWithLastTab: false,
-        });
+    gBrowser.removeTabs(
+      Array.from(gBrowser.tabs).filter(
+        (tab) => tab.getAttribute('zen-workspace-id') === workspaceID && !tab.hasAttribute('zen-empty-tab')
+      ),
+      {
+        animate: false,
+        skipSessionStore: true,
+        closeWindowWithLastTab: false,
       }
-    }
+    );
   }
 
   moveTabToWorkspace(tab, workspaceID) {

src/browser/components/tabbrowser/content/tabs-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index fa96568d366fd3608f9bd583fa793150bd815c8b..24071f1bc0d9cb2a4fe66e5e4657a64ab66f29cf 100644
+index fa96568d366fd3608f9bd583fa793150bd815c8b..a13d501f2f0f190b9dc8fe0ce4f1d7af66b0495e 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -60,7 +60,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..24071f1bc0d9cb2a4fe66e5e4657a64a
  
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
-+      if (draggedTab.hasAttribute("zen-has-splitted")) {
++      if (draggedTab?.hasAttribute("zen-has-splitted")) {
 +        draggedTab.removeAttribute("zen-has-splitted");
 +        draggedTab._visuallySelected = false;
 +      }