mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-05-03 04:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add removePopupTrackingAttribute method, refactor onPopupHidden.

Browse Source
This commit is contained in:
brahim
2024-09-21 11:50:15 +02:00
parent 863d087ae8
commit b06edc0dd9
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/browser/base/content/ZenUIManager.mjs
View File

@@ -3,9 +3,8 @@ var gZenUIManager = {
init () {
addEventListener('popupshowing', this.onPopupShowing.bind(this));
addEventListener('popuphidden', this.onPopupHidden.bind(this));
addEventListener('click', this.onClick.bind(this));
document.addEventListener('popupshowing', this.onPopupShowing.bind(this));
document.addEventListener('popuphidden', this.onPopupHidden.bind(this));
},
openAndChangeToTab(url, options) {
@@ -38,19 +37,21 @@ var gZenUIManager = {
* Adds the 'has-popup-menu' attribute to the element when popup is opened on it.
* @param element element to track
*/
addPopupTracking(element) {
addPopupTrackingAttribute(element) {
this._popupTrackingElements.push(element);
},
removePopupTrackingAttribute(element) {
this._popupTrackingElements.remove(element);
},
onPopupShowing(showEvent) {
for (const el of this._popupTrackingElements) {
if (!el.contains(event.explicitOriginalTarget)) {
continue;
}
removeEventListener('mousemove', this.__removeHasPopupAttribute);
document.removeEventListener('mousemove', this.__removeHasPopupAttribute);
el.setAttribute('has-popup-menu', '');
this.__lastElementClicked = null;
this.__currentPopup = showEvent.target;
this.__currentPopupTrackElement = el;
break;
@@ -62,22 +63,15 @@ var gZenUIManager = {
return;
}
const element = this.__currentPopupTrackElement;
/* If item is selected on popup, the :hover effect will not be reapplied until the cursor moves,
to mitigate this: Wait for mousemove when popup item selected
*/
if (this.__lastElementClicked?.tagName === 'menuitem') {
this.__removeHasPopupAttribute = () => element.removeAttribute('has-popup-menu');
addEventListener('mousemove', this.__removeHasPopupAttribute, {once: true});
} else {
if (document.getElementById('main-window').matches(':hover')) {
element.removeAttribute('has-popup-menu');
} else {
this.__removeHasPopupAttribute = () => element.removeAttribute('has-popup-menu');
document.addEventListener('mousemove', this.__removeHasPopupAttribute, {once: true});
}
this.__currentPopup = null;
this.__currentPopupTrackElement = null;
},
onClick(event) {
this.__lastElementClicked = event.target;
},
};
var gZenVerticalTabsManager = {
@@ -205,8 +199,8 @@ var gZenCompactModeManager = {
Services.prefs.addObserver('zen.view.compact', this._updateEvent.bind(this));
Services.prefs.addObserver('zen.view.compact.toolbar-flash-popup.duration', this._updatedSidebarFlashDuration.bind(this));
gZenUIManager.addPopupTracking(this.sidebar);
gZenUIManager.addPopupTracking(document.getElementById('zen-appcontent-navbar-container'));
gZenUIManager.addPopupTrackingAttribute(this.sidebar);
gZenUIManager.addPopupTrackingAttribute(document.getElementById('zen-appcontent-navbar-container'));
},
get prefefence() {