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

Merge pull request #2179 from mozilla/fix-mac-658

Browse source 
Fix MAC-658
This commit is contained in:
Andrea Marchesini 2021-10-28 16:21:13 +02:00 • committed by GitHub
commit bfde6d73e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/css/popup.css
View file

@ -895,6 +895,7 @@ input.proxies {
block-size: var(--panelSize);
max-block-size: var(--panelSize);
min-block-size: var(--panelSize);
overflow-x: hidden;
}
.proxy-panel-title {

26
src/js/popup.js
View file

@ -1943,17 +1943,6 @@ Logic.registerPanel(P_MOZILLA_VPN_SERVER_LIST, {
Utils.addEnterHandler(document.getElementById("moz-vpn-return"), async () => {
const identity = Logic.currentIdentity();
const { mozillaVpnServers } = await browser.storage.local.get("mozillaVpnServers");
const selectedServer = document.querySelector(".server-radio-btn:checked");
const proxy = MozillaVPN.getProxy(
selectedServer.dataset.countryCode,
selectedServer.dataset.cityName,
true,
mozillaVpnServers
);
await proxifiedContainers.set(identity.cookieStoreId, proxy);
Logic.showPanel(P_CONTAINER_EDIT, identity, false, false);
Logic.showPreviousPanel();
});
@ -1997,6 +1986,21 @@ Logic.registerPanel(P_MOZILLA_VPN_SERVER_LIST, {
radioBtn.dataset.cityName = city.name;
radioBtn.name = "server-city";
const cityListItem = cityTemplateClone.querySelector(".server-city-list-item");
Utils.addEnterHandler((cityListItem), async(e) => {
if (e.key === "Enter") {
radioBtn.checked = true;
}
const identity = Logic.currentIdentity();
const proxy = MozillaVPN.getProxy(
radioBtn.dataset.countryCode,
radioBtn.dataset.cityName,
true,
mozillaVpnServers
);
await proxifiedContainers.set(identity.cookieStoreId, proxy);
});
// Set city name
cityName.textContent = city.name;
cityList.appendChild(cityTemplateClone);

2
src/popup.html
View file

@ -408,7 +408,7 @@
</template>
<template id="server-city-list-items">
<li>
<label class="server-city-list-item">
<label class="server-city-list-item" tabindex="0">
<input class="server-radio-btn" type="radio" data-country-code="" data-city-name="" checked=""/>
<div class="server-radio-control"></div>
<span class="server-city-name"></span>