From bb80a4a190d2261066ad1b82001dacec38519105 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Mon, 18 Oct 2021 08:02:06 +0300 Subject: [PATCH] Fix Apple login page --- keepassxc-browser/common/sites.js | 3 ++- keepassxc-browser/content/ui.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keepassxc-browser/common/sites.js b/keepassxc-browser/common/sites.js index 8e0f97d..241c2fd 100644 --- a/keepassxc-browser/common/sites.js +++ b/keepassxc-browser/common/sites.js @@ -76,7 +76,8 @@ kpxcSites.exceptionFound = function(identifier) { } if (document.location.origin === 'https://idmsa.apple.com' - && [ 'password', 'form-row', 'show-password' ].every(c => identifier.contains(c))) { + && ((typeof identifier === 'string' && identifier === 'password_text_field') + || [ 'password', 'form-row', 'show-password' ].every(c => identifier.contains(c)))) { return true; } else if (document.location.origin.startsWith('https://signin.ebay.') && (identifier === 'null' || identifier.value === 'null' || identifier === 'pass')) { diff --git a/keepassxc-browser/content/ui.js b/keepassxc-browser/content/ui.js index 6cfce2d..f9b4765 100644 --- a/keepassxc-browser/content/ui.js +++ b/keepassxc-browser/content/ui.js @@ -273,7 +273,7 @@ document.addEventListener('mousemove', function(e) { const xPos = e.clientX - kpxcDefine.diffX; const yPos = e.clientY - kpxcDefine.diffY; - if (kpxcDefine.selected !== null) { + if (kpxcDefine.selected && kpxcDefine.dialog) { kpxcDefine.dialog.style.left = Pixels(xPos); kpxcDefine.dialog.style.top = Pixels(yPos); }