rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2380 from dannycolin/issue-2377

Browse source 
Fix #2377 Tooltip renders off viewport when hovering over a container assigned to VPN.
This commit is contained in:
Danny Colin 2022-06-21 15:57:28 -04:00 • committed by GitHub
commit 66b90006bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/js/mozillaVpn.js
View file

@ -34,11 +34,8 @@ const MozillaVPN = {
} }
if (!mozillaVpnConnected && proxy.mozProxyEnabled) { if (!mozillaVpnConnected && proxy.mozProxyEnabled) {
flag.classList.add("proxy-unavailable"); flag.classList.add("proxy-unavailable");
const tooltip = el.querySelector(".tooltip.proxy-unavailable");
if (tooltip) {
tooltip.textContent = tooltipProxyWarning;
}
const menuItemName = el.querySelector(".menu-item-name"); const menuItemName = el.querySelector(".menu-item-name");
menuItemName.setAttribute("title", tooltipProxyWarning);
if (menuItemName) { if (menuItemName) {
el.querySelector(".menu-item-name").dataset.mozProxyWarning = "proxy-unavailable"; el.querySelector(".menu-item-name").dataset.mozProxyWarning = "proxy-unavailable";
} }
@ -68,14 +65,11 @@ const MozillaVPN = {
const mozillaVpnConnected = await browser.runtime.sendMessage({ method: "MozillaVPN_getConnectionStatus" }); const mozillaVpnConnected = await browser.runtime.sendMessage({ method: "MozillaVPN_getConnectionStatus" });
const connectionStatusStringId = mozillaVpnConnected ? "moz-vpn-connected" : "moz-vpn-disconnected"; const connectionStatusStringId = mozillaVpnConnected ? "moz-vpn-connected" : "moz-vpn-disconnected";
const connectionStatusLocalizedString = browser.i18n.getMessage(connectionStatusStringId); const connectionStatusLocalizedString = browser.i18n.getMessage(connectionStatusStringId);
const connectionStatusTooltip = document.querySelector(".vpn-status-container-list");
connectionStatusTooltip.setAttribute("title", connectionStatusLocalizedString);
statusIconEls.forEach(el => { statusIconEls.forEach(el => {
el.style.backgroundImage = mozillaVpnConnected ? connectedIndicatorSrc : disconnectedIndicatorSrc; el.style.backgroundImage = mozillaVpnConnected ? connectedIndicatorSrc : disconnectedIndicatorSrc;
if (el.querySelector(".tooltip")) {
el.querySelector(".tooltip").textContent = connectionStatusLocalizedString;
} else {
el.textContent = connectionStatusLocalizedString;
}
}); });
}, },

1
src/js/popup.js
View file

@ -789,7 +789,6 @@ Logic.registerPanel(P_CONTAINERS_LIST, {
</div> </div>
</div> </div>
<span class="menu-text">${identity.name}</span> <span class="menu-text">${identity.name}</span>
<span class="tooltip proxy-unavailable"></span>
</div> </div>
<span class="menu-right-float"> <span class="menu-right-float">
<img alt="" class="always-open-in-flag flag-img" src="/img/flags/.png"/> <img alt="" class="always-open-in-flag flag-img" src="/img/flags/.png"/>

1
src/popup.html
View file

@ -154,7 +154,6 @@
<div class="sub-header" data-i18n-message-id="containers"></div> <div class="sub-header" data-i18n-message-id="containers"></div>
<h4 class="moz-vpn-logotype vpn-status-container-list display-none">Mozilla VPN <h4 class="moz-vpn-logotype vpn-status-container-list display-none">Mozilla VPN
<span class="moz-vpn-connection-status-indicator container-list-status-icon"> <span class="moz-vpn-connection-status-indicator container-list-status-icon">
<span class="tooltip"></span>
</span> </span>
</h4> </h4>
</div> </div>