From a31a66da3ba55873f4ca2631ad52173e1f9d7ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20V=C3=A4nttinen?= Date: Fri, 1 Jul 2022 17:21:00 +0300 Subject: [PATCH] Fix some leftovers from jQuery removal (#1657) Fix some leftovers from jQuery removal --- keepassxc-browser/options/options.html | 2 +- keepassxc-browser/options/options.js | 5 ----- keepassxc-browser/options/shortcuts.html | 3 +-- keepassxc-browser/options/shortcuts.js | 4 ++-- keepassxc-browser/popups/popup_httpauth.html | 1 - 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html index 14bb9ce..8c6c35f 100644 --- a/keepassxc-browser/options/options.html +++ b/keepassxc-browser/options/options.html @@ -149,7 +149,7 @@ : error
: error

-

+

diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index efeaf89..cbbf607 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -660,11 +660,6 @@ options.initAbout = function() { $('#tab-about span.kpxcbrVersion').textContent = version; $('#tab-about span.kpxcbrOS').textContent = platform; $('#tab-about span.kpxcbrBrowser').textContent = getBrowserId(); - - // Hides keyboard shortcut configure button if Firefox version is < 60 (API is not compatible) - if (isFirefox() && Number(navigator.userAgent.substr(navigator.userAgent.lastIndexOf('/') + 1, 2)) < 60) { - $('#chrome-only').remove(); - } }; options.initTheme = function() { diff --git a/keepassxc-browser/options/shortcuts.html b/keepassxc-browser/options/shortcuts.html index 687f948..884b97a 100644 --- a/keepassxc-browser/options/shortcuts.html +++ b/keepassxc-browser/options/shortcuts.html @@ -11,10 +11,9 @@ - - + diff --git a/keepassxc-browser/options/shortcuts.js b/keepassxc-browser/options/shortcuts.js index a99b2d0..ba73364 100644 --- a/keepassxc-browser/options/shortcuts.js +++ b/keepassxc-browser/options/shortcuts.js @@ -113,7 +113,7 @@ function shortCutChanged(e) { } -$(async function() { +(async function() { try { const settings = await browser.runtime.sendMessage({ action: 'load_settings' }); if (settings['colorTheme'] === undefined) { @@ -128,7 +128,7 @@ $(async function() { } catch (err) { console.log('Error loading options page: ' + err); } -}); +})(); const saveButtons = document.querySelectorAll('.btn-primary'); for (const b of saveButtons) { diff --git a/keepassxc-browser/popups/popup_httpauth.html b/keepassxc-browser/popups/popup_httpauth.html index 75733e2..ff66afd 100644 --- a/keepassxc-browser/popups/popup_httpauth.html +++ b/keepassxc-browser/popups/popup_httpauth.html @@ -9,7 +9,6 @@ -