wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-05 06:47:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2023-12-15 10:29:04 +08:00
commit 5a362aa15b
68 changed files with 186 additions and 2246 deletions
Download patch file Download diff file Expand all files Collapse all files

1
application/palemoon/base/content/browser-menubar.inc
View file

@ -371,7 +371,6 @@
placespopup="true"
context="placesContext"
openInTabs="children"
onmouseup="BookmarksEventHandler.onMouseUp(event);"
oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
onpopupshowing="PlacesCommandHook.updateBookmarkAllTabsCommand();

61
application/palemoon/base/content/browser-places.js
View file

@ -767,46 +767,17 @@ HistoryMenu.prototype = {
* Functions for handling events in the Bookmarks Toolbar and menu.
*/
var BookmarksEventHandler = {
/**
* Handler for mouseUp event for an item in the bookmarks toolbar or menu.
* When items are middle-clicked (or clicked with modifier), check if the
* menu should remain open.
* @param aEvent
* DOMEvent for the click
*/
onMouseUp(aEvent) {
// Handles left-click with modifier if not browser.bookmarks.openInTabClosesMenu.
if (aEvent.button != 0 ||
Services.prefs.getBoolPref("browser.bookmarks.openInTabClosesMenu", true))
return;
let target = aEvent.originalTarget;
if (target.tagName != "menuitem")
return;
#ifdef XP_MACOSX
var modifKey = aEvent.metaKey;
#else
var modifKey = aEvent.ctrlKey;
#endif
// Don't keep menu open for 'Open all in Tabs'.
if (modifKey && !target.classList.contains("openintabs-menuitem")) {
target.setAttribute("closemenu", "none");
}
},
/**
* Handler for click event for an item in the bookmarks toolbar or menu.
* Menus and submenus from the folder buttons bubble up to this handler.
* Left-click is handled in the onCommand function.
* When items are middle-clicked (or clicked with modifier), open in tabs.
* If the click came through a menu, close the menu unless preffed otherwise.
* If the click came through a menu, close the menu.
* @param aEvent
* DOMEvent for the click
* @param aView
* The places view which aEvent should be associated with.
*/
onClick: function(aEvent, aView) {
// Only handle middle-click or left-click with modifiers.
var modifKey = aEvent.ctrlKey || aEvent.shiftKey;
@ -815,23 +786,19 @@ var BookmarksEventHandler = {
}
var target = aEvent.originalTarget;
// If this event bubbled up from a menu or menuitem,
// close the menus if browser.bookmarks.openInTabClosesMenu.
if ((Services.prefs.getBoolPref("browser.bookmarks.openInTabClosesMenu", true) &&
target.tagName == "menuitem") ||
target.tagName == "menu" ||
target.classList.contains("openintabs-menuitem")) {
closeMenus(aEvent.target);
}
// Command already precesssed so remove any closemenu attr set in onMouseUp.
if (aEvent.button == 0 &&
target.tagName == "menuitem" &&
target.getAttribute("closemenu") == "none") {
// On Mac we need to extend when we remove the flag, to avoid any pre-close
// animations.
setTimeout(() => {
target.removeAttribute("closemenu");
}, 500);
// If this event bubbled up from a menu or menuitem, close the menus.
// Do this before opening tabs, to avoid hiding the open tabs confirm-dialog.
if (target.localName == "menu" || target.localName == "menuitem") {
for (node = target.parentNode; node; node = node.parentNode) {
if (node.localName == "menupopup") {
node.hidePopup();
} else if (node.localName != "menu" &&
node.localName != "splitmenu" &&
node.localName != "hbox" &&
node.localName != "vbox" ) {
break;
}
}
}
if (target._placesNode && PlacesUtils.nodeIsContainer(target._placesNode)) {

2
application/palemoon/base/content/browser.xul
View file

@ -548,7 +548,6 @@
placespopup="true"
context="placesContext"
openInTabs="children"
onmouseup="BookmarksEventHandler.onMouseUp(event);"
oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
onclick="event.stopPropagation();
BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
@ -705,7 +704,6 @@
<hbox flex="1"
id="PlacesToolbar"
context="placesContext"
onmouseup="BookmarksEventHandler.onMouseUp(event);"
onclick="BookmarksEventHandler.onClick(event, this._placesView);"
oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
tooltip="bhTooltip"