-
diff --git a/keepassxc-browser/popups/popup.js b/keepassxc-browser/popups/popup.js
index 7d2a5ad..3a1ec33 100644
--- a/keepassxc-browser/popups/popup.js
+++ b/keepassxc-browser/popups/popup.js
@@ -75,6 +75,7 @@ const sendMessageToTab = async function(message) {
};
(async () => {
+ resizePopup();
await initColorTheme();
$('#connect-button').addEventListener('click', async () => {
diff --git a/keepassxc-browser/popups/popup_functions.js b/keepassxc-browser/popups/popup_functions.js
index e63c051..8795b1c 100644
--- a/keepassxc-browser/popups/popup_functions.js
+++ b/keepassxc-browser/popups/popup_functions.js
@@ -4,6 +4,9 @@ const $ = function(elem) {
return document.querySelector(elem);
};
+const DEFAULT_POPUP_SIZE = '460px';
+const PINNED_POPUP_SIZE = '380px';
+
function updateAvailableResponse(available) {
if (available) {
$('#update-available').show();
@@ -11,11 +14,16 @@ function updateAvailableResponse(available) {
}
async function initSettings() {
- $('#settings #btn-options').addEventListener('click', () => {
+ $('#settings #options-button').addEventListener('click', () => {
browser.runtime.openOptionsPage().then(close());
});
- $('#settings #btn-choose-credential-fields').addEventListener('click', async () => {
+ const customLoginFieldsButton = document.body.querySelector('#settings #choose-custom-login-fields-button');
+ if (isFirefox()) {
+ customLoginFieldsButton.id = 'choose-custom-login-fields-button-moz';
+ }
+
+ customLoginFieldsButton.addEventListener('click', async () => {
await browser.windows.getCurrent();
const tabs = await browser.tabs.query({ active: true, currentWindow: true });
const tab = tabs[0];
@@ -28,7 +36,6 @@ async function initSettings() {
});
}
-
async function initColorTheme() {
const colorTheme = await browser.runtime.sendMessage({
action: 'get_color_theme'
@@ -41,6 +48,21 @@ async function initColorTheme() {
}
}
+// Sets default popup size for Chromium based browsers to prevent flash on popup open
+function setDefaultPopupSize() {
+ if (!isFirefox()) {
+ document.body.style.width = DEFAULT_POPUP_SIZE;
+ }
+}
+
+// Resizes the popup to the default size if the width is too small
+function resizePopup() {
+ if (document.body.offsetWidth > 0 && document.body.offsetWidth < 100) {
+ document.body.style.width = isFirefox() ? PINNED_POPUP_SIZE : DEFAULT_POPUP_SIZE;
+ } else {
+ document.body.style.width = DEFAULT_POPUP_SIZE;
+ }
+}
(async () => {
if (document.readyState === 'complete' || (document.readyState !== 'loading' && !document.documentElement.doScroll)) {
diff --git a/keepassxc-browser/popups/popup_httpauth.html b/keepassxc-browser/popups/popup_httpauth.html
index e961afd..75733e2 100644
--- a/keepassxc-browser/popups/popup_httpauth.html
+++ b/keepassxc-browser/popups/popup_httpauth.html
@@ -12,22 +12,29 @@
-
+
+
+
diff --git a/keepassxc-browser/popups/popup_httpauth.js b/keepassxc-browser/popups/popup_httpauth.js
index d06474d..5ab96e0 100644
--- a/keepassxc-browser/popups/popup_httpauth.js
+++ b/keepassxc-browser/popups/popup_httpauth.js
@@ -7,8 +7,11 @@ const getLoginData = async () => {
};
(async () => {
+ resizePopup();
await initColorTheme();
+ $('#lock-database-button').show();
+
const data = await getLoginData();
const ll = document.getElementById('login-list');
for (let i = 0; i < data.logins.length; ++i) {
@@ -45,6 +48,7 @@ const getLoginData = async () => {
$('.credentials').hide();
$('#btn-dismiss').hide();
$('#database-not-opened').show();
+ $('#lock-database-button').hide();
$('#database-error-message').textContent = tr('errorMessageDatabaseNotOpened');
});
diff --git a/keepassxc-browser/popups/popup_login.html b/keepassxc-browser/popups/popup_login.html
index ea73400..37f4ba6 100644
--- a/keepassxc-browser/popups/popup_login.html
+++ b/keepassxc-browser/popups/popup_login.html
@@ -11,21 +11,28 @@
-
+
+
-
-
-
-
-
+
+
@@ -42,7 +49,7 @@
-
diff --git a/keepassxc-browser/popups/popup_login.js b/keepassxc-browser/popups/popup_login.js
index 60ab0d7..ac2d547 100644
--- a/keepassxc-browser/popups/popup_login.js
+++ b/keepassxc-browser/popups/popup_login.js
@@ -1,8 +1,11 @@
'use strict';
(async () => {
+ resizePopup();
await initColorTheme();
+ $('#lock-database-button').show();
+
const global = await browser.runtime.getBackgroundPage();
const tabs = await browser.tabs.query({ active: true, currentWindow: true });
if (tabs.length === 0) {
@@ -67,10 +70,11 @@
$('#credentialsList').hide();
$('#database-not-opened').show();
+ $('#lock-database-button').hide();
$('#database-error-message').textContent = tr('errorMessageDatabaseNotOpened');
});
- $('#reopen-database-button').click((e) => {
+ $('#reopen-database-button').addEventListener('click', (e) => {
browser.runtime.sendMessage({
action: 'get_status',
args: [ false, true ] // Set forcePopup to true