(JS) update openBookmarkInContainerTab.uc.js

aminomancer · aminomancer · commit c68eee48884d · 2022-04-12T19:20:38.000-07:00
and openLinkInUnloadedTab.uc.js
to keep up with Firefox updates and to fix a bug.
diff --git a/JS/openBookmarkInContainerTab.uc.js b/JS/openBookmarkInContainerTab.uc.js
@@ -1,9 +1,9 @@
 // ==UserScript==
 // @name           Open Bookmark in Container Tab (context menu)
-// @version        1.1
+// @version        1.2.1
 // @author         aminomancer
 // @homepage       https://github.com/aminomancer/uc.css.js
-// @description    Adds a new menu to context menus prompted by right-clicking bookmarks, history entries, etc. that allows you to open them in a container tab. This does basically the same thing as the similarly-named addon by Rob Wu, just by a different method. By doing this with an autoconfig script, we can make the menu appear in a logical order towards the top of the context menu rather than at the very bottom, where context menu items from addons always go.
+// @description    Adds a new menu to context menus prompted by right-clicking bookmarks, history entries, etc. that allows you to open them in a container tab. This does basically the same thing as the similarly-named addon by Rob Wu, just by a different method. By doing this with an autoconfig script, we can make the menu appear in a logical order towards the top of the context menu rather than at the very bottom, where context menu items from addons always go. Since Bug 1754805, the main menu created by this script is obsolete — the "Open in New Container Tab" menu opened on bookmarks and history items. So as of version 1.2, that menu has been removed. However, this still
 // @license        This Source Code Form is subject to the terms of the Creative Commons Attribution-NonCommercial-ShareAlike International License, v. 4.0. If a copy of the CC BY-NC-SA 4.0 was not distributed with this file, You can obtain one at http://creativecommons.org/licenses/by-nc-sa/4.0/ or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 // @include        main
 // @include        chrome://browser/content/places/bookmarksSidebar.xhtml
@@ -15,7 +15,6 @@ class OpenPlacesInContainerTabMenu {
     static config = {
         l10n: {
             openAll: `Open All in Container Tabs`, // Appears when right-clicking a container/folder in bookmarks or history.
-            openBookmark: `Open in New Container Tab`, // Appears when right-clicking a bookmark, history item, etc.
             openSyncedTab: `Open in a New Container Tab`, // Appears when right-clicking a tab in the synced tabs sidebar.
             accessKey: `c`, // All of the menu items use a predefined access key. Access keys are underlined in the menu item's label, and pressing them on your keyboard automatically selects the menu item. They serve as hotkeys while the context menu is open. The default access key is "c" for the english "Container." This collides with the "Copy" menu item, so if you leave this set to "c" the script will change the Copy access key to "y" so they don't collide. It won't do that if you change this variable though. If the chosen access key is not present in the menu item's label, instead of being underlined in the label, it will be shown after the label in parentheses, e.g. "Open All in Container Tabs (G)"
         },
@@ -27,20 +26,6 @@ class OpenPlacesInContainerTabMenu {
 
         if (l10n.accessKey === `c`) this.placesMenuCopy.accessKey = `y`;
 
-        this.placesMenuOpenInContainer = this.create(document, "menu", {
-            id: "placesContext_open:container",
-            label: l10n.openBookmark,
-            accesskey: l10n.accessKey,
-            disabled: true,
-            hidden: true,
-        });
-        this.placesMenuOpenNewTab.after(this.placesMenuOpenInContainer);
-        let openPopup = this.placesMenuOpenInContainer.appendChild(
-            document.createXULElement("menupopup")
-        );
-        openPopup.addEventListener("command", (e) => this.openLinkInContainer(e, openPopup));
-        popups.push(openPopup);
-
         this.placesMenuOpenAllInContainer = this.create(document, "menu", {
             id: "placesContext_openContainer:container",
             label: l10n.openAll,
@@ -253,8 +238,6 @@ class OpenPlacesInContainerTabMenu {
             this.placesMenuOpenBookmarkLinks?.hidden;
         this.placesMenuOpenAllLinksInContainer.disabled = this.placesMenuOpenAllLinks?.disabled;
         this.placesMenuOpenAllLinksInContainer.hidden = this.placesMenuOpenAllLinks?.hidden;
-        this.placesMenuOpenInContainer.disabled = this.placesMenuOpenNewTab?.disabled;
-        this.placesMenuOpenInContainer.hidden = this.placesMenuOpenNewTab?.hidden;
     }
     onSyncedContextMenuShowing(_e) {
         this.syncedContextMenuInited = true;
@@ -293,10 +276,22 @@ class OpenPlacesInContainerTabMenu {
         let items = [];
         if (PlacesUtils.nodeIsContainer(folder)) {
             let root = PlacesUtils.getContainerNodeWithOptions(folder, false, true);
+            let result = root.parentResult;
+            let wasOpen = root.containerOpen;
+            let didSuppressNotifications = false;
+            if (!wasOpen) {
+                didSuppressNotifications = result.suppressNotifications;
+                if (!didSuppressNotifications) result.suppressNotifications = true;
+                root.containerOpen = true;
+            }
             for (let i = 0; i < root.childCount; ++i) {
                 let child = root.getChild(i);
                 if (PlacesUtils.nodeIsURI(child)) items.push({ url: child.uri });
             }
+            if (!wasOpen) {
+                root.containerOpen = false;
+                if (!didSuppressNotifications) result.suppressNotifications = false;
+            }
         } else items = folder;
         this.openLinkInContainer(e, popup, items);
     }
diff --git a/JS/openLinkInUnloadedTab.uc.js b/JS/openLinkInUnloadedTab.uc.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name           Open Link in Unloaded Tab (context menu item)
-// @version        1.5
+// @version        1.5.1
 // @author         aminomancer
 // @homepage       https://github.com/aminomancer
 // @description    Add a new menu item to context menus prompted by right/accel-clicking on links or other link-like affordances. The menu item will open the link in a new background tab without loading the page. So the tab will start unloaded or "discarded." The context menu entry appears in the content area context menu when right-clicking a link; and in every menu where bookmarks, history, and synced tabs can be interacted with — sidebar, menubar, toolbar, toolbar button popup, and library window. Script is a remake of "Open in Unloaded Tab" by xiaoxiaoflood, but intended for use with fx-autoconfig by MrOtherGuy. It should still work with other loaders that load user scripts per-window, such as alice0775's loader, but is not compatible with older loaders or those like xiaoxiaoflood's loader. The difference is that those loaders run scripts in the global execution context, and simply call a global function when a window is launched, (the global function takes the window as a parameter) whereas fx-autoconfig loads normal scripts entirely within the window context, unless explicitly told to do otherwise. When you open a bookmark or history item in an unloaded tab, the tab draws its title from the entry in the places database. But when you open a link in an unloaded tab, there is no preexisting title. Normally when opening a link in a tab, the title is updated as the tab loads, but since we're opening the tab unloaded from the beginning, Firefox is less likely to know what the document's final title is. By default, the script works around this by generating a temporary title for the tab based on the text of the link that was opened. So if you click a hyperlink "https://mozilla.org" whose label text says "Mozilla" the title will be set to Mozilla until the tab is loaded. But if you click a hyperlink whose label text is the same as the URL itself, the title will simply be the URL. There's a user preference for this, however. If you just want to use the URL for the title no matter what, toggle this pref to false in about:config: "userChrome.openLinkInUnloadedTab.use_link_text_as_tab_title_when_unknown"
@@ -257,6 +257,14 @@ const unloadedTabMenuL10n = {
             let items = [];
             if (PlacesUtils.nodeIsContainer(folder)) {
                 let root = PlacesUtils.getContainerNodeWithOptions(folder, false, true);
+                let result = root.parentResult;
+                let wasOpen = root.containerOpen;
+                let didSuppressNotifications = false;
+                if (!wasOpen) {
+                    didSuppressNotifications = result.suppressNotifications;
+                    if (!didSuppressNotifications) result.suppressNotifications = true;
+                    root.containerOpen = true;
+                }
                 for (let i = 0; i < root.childCount; ++i) {
                     let child = root.getChild(i);
                     if (PlacesUtils.nodeIsURI(child)) {
@@ -267,6 +275,10 @@ const unloadedTabMenuL10n = {
                         });
                     }
                 }
+                if (!wasOpen) {
+                    root.containerOpen = false;
+                    if (!didSuppressNotifications) result.suppressNotifications = false;
+                }
             } else items = folder;
             items.forEach((item) => this.openTab(item, { bulkOpen: true }));
         }
diff --git a/README.md b/README.md
@@ -820,11 +820,9 @@ This does basically the same thing as the [similarly-named addon](https://addons
 
 The menu will be present in _all_ context menus where you'd be able to open a bookmark, history entry, or synced tab, including menus, popups, panels, and even the Library/Bookmarks Manager window. However, for synced tabs, it will only be present in the sidebar, not in the profile panel, because the profile panel lacks a context menu in the first place. Right-clicking a synced tab in the profile panel simply opens the synced tab rather than opening a context menu.
 
-Update: The developers of Firefox Multi-Account Containers have implemented an optional setting that creates a similar menu when right-clicking bookmarks. However, this has all the same problems as the addon previously mentioned. It doesn't work on history entries or synced tabs, it puts the menu item at the bottom of the context menu instead of with the other "open x in tab" menu items, and it doesn't apply the correct colors to the container icons.
+Update: Firefox has implemented a similar menu for bookmarks and history items. It doesn't yet support opening all bookmarks in a folder, and it doesn't add a similar menu to the synced tabs sidebar. So for the moment, this script still has some purpose. It's been updated to avoid making a redundant menu, so if you see 2 identical menus, update your script with the version on this repo.
 
-That is, the "Personal" container is set to blue by default. It shows up as blue in all the native interfaces and in the extension pages & popups. But because extensions can't control context menu CSS, it isn't blue in the extension's optional bookmark context menu. All the icons in the extension menu are just black.
-
-So for several reasons, this script is still the best solution. If you use this script, turn off the redundant extension menus in `about:addons` > Firefox Multi-Account Containers > Options > "Enable Bookmark Menus"
+If you use this script and Firefox Multi-Account Containers, turn off the redundant extension menus in `about:addons` > Firefox Multi-Account Containers > Options > "Enable Bookmark Menus"
 
 </details>
 
diff --git a/uc-context-menu-icons.css b/uc-context-menu-icons.css
@@ -80,7 +80,7 @@ menuitem#sanitizeItem > .menu-text,
     .menu-text,
 #placesContext_new\:folder .menu-text,
 #placesContext_new\:separator .menu-text,
-:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container)
+:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container, #placesContext_open\:newcontainertab)
     > .menu-text,
 :is(#syncedTabsOpenAllInContainer, #syncedTabsOpenInContainer) > .menu-text,
 #bookmark-menu-container_robwu_nl-menuitem-_bookmark-menu-item:not(.menuitem-iconic) > .menu-text,
@@ -524,7 +524,7 @@ menuitem#repair-text-encoding::before,
 :is(#placesContext_new\:bookmark, #placesContext_createBookmark, #syncedTabsBookmarkSelected)::before,
 #placesContext_new\:folder::before,
 #placesContext_new\:separator::before,
-:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container)::before,
+:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container, #placesContext_open\:newcontainertab)::before,
 :is(#syncedTabsOpenAllInContainer, #syncedTabsOpenInContainer)::before,
 #bookmark-menu-container_robwu_nl-menuitem-_bookmark-menu-item:not(.menuitem-iconic)::before,
 #placesContext
@@ -1112,7 +1112,7 @@ menuitem.customize-context-CopyID::before {
     background-image: url(chrome://userchrome/content/skin/tab.svg);
 }
 
-:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container)::before,
+:is(#placesContext_open\:container, #placesContext_openContainer\:container, #placesContext_openLinks\:container, #placesContext_open\:newcontainertab)::before,
 :is(#syncedTabsOpenAllInContainer, #syncedTabsOpenInContainer)::before,
 #bookmark-menu-container_robwu_nl-menuitem-_bookmark-menu-item:not(.menuitem-iconic)::before,
 #placesContext
