diff options
| author | Sami Vänttinen <sami.vanttinen@protonmail.com> | 2022-07-01 17:21:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-01 17:21:00 +0300 |
| commit | a31a66da3ba55873f4ca2631ad52173e1f9d7ba8 (patch) | |
| tree | 58c143534701412389d885d6a794f2865f6e63b4 | |
| parent | 48857a484a9d7043c8f4a374b60825d57b4cf2f5 (diff) | |
Fix some leftovers from jQuery removal (#1657)
Fix some leftovers from jQuery removal
| -rw-r--r-- | keepassxc-browser/options/options.html | 2 | ||||
| -rw-r--r-- | keepassxc-browser/options/options.js | 5 | ||||
| -rw-r--r-- | keepassxc-browser/options/shortcuts.html | 3 | ||||
| -rw-r--r-- | keepassxc-browser/options/shortcuts.js | 4 | ||||
| -rw-r--r-- | 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 @@ <span data-i18n="contextMenuFillTOTP"></span>: <span id="fill_totp-shortcut">error</span><br /> <span data-i18n="contextMenuShowPasswordGenerator"></span>: <span id="show_password_generator-shortcut">error</span> </p> - <p id="chrome-only"> + <p> <button class="btn btn-sm btn-success" id="configureCommands" type="button" data-i18n="[title]openNewTab"> <i class="fa fa-keyboard-o" aria-hidden="true"></i><span data-i18n="optionsConfigureShortcuts"></span> </button> 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 @@ <link rel="icon" type="image/png" href="../icons/keepassxc_64x64.png" sizes="64x64"> <link rel="icon" type="image/png" href="../icons/keepassxc_96x96.png" sizes="96x96"> <script src="../common/browser-polyfill.min.js"></script> - <script src="../bootstrap/jquery-3.4.1.min.js"></script> <script src="../bootstrap/bootstrap.min.js"></script> - <script defer src="shortcuts.js"></script> <script defer src="../common/global.js"></script> + <script defer src="shortcuts.js"></script> <script defer src="../common/translate.js"></script> </head> <body> 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 @@ <link rel="stylesheet" href="../fonts/fork-awesome.min.css" /> <script src="../common/browser-polyfill.min.js"></script> <script src="../common/global.js"></script> - <script src="../bootstrap/jquery-3.4.1.min.js"></script> <script src="../bootstrap/bootstrap.min.js"></script> <script src="popup_functions.js"></script> <script defer src="popup_httpauth.js"></script> |