prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1049 from keepassxreboot/fix/add_extra_checks_for_document_body

Browse source 
Add extra checks for document.body
This commit is contained in:
Sami Vänttinen 2020-10-22 13:24:26 +03:00 committed by GitHub
commit c5e6471a08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
keepassxc-browser/content/keepassxc-browser.js
View file

@ -1588,7 +1588,8 @@ kpxcObserverHelper.ignoredElement = function(target) {
// Ignores all nodes that doesn't contain elements
// Also ignore few Youtube-specific custom nodeNames
kpxcObserverHelper.ignoredNode = function(target) {
if (kpxcObserverHelper.ignoredNodeTypes.some(e => e === target.nodeType)
if (!target
||kpxcObserverHelper.ignoredNodeTypes.some(e => e === target.nodeType)
|| kpxcObserverHelper.ignoredNodeNames.some(e => e === target.nodeName)
|| target.nodeName.startsWith('YTMUSIC')
|| target.nodeName.startsWith('YT-')) {
@ -1647,7 +1648,9 @@ kpxcObserverHelper.initObserver = async function() {
}
});
kpxc.observer.observe(document.body, kpxcObserverHelper.observerConfig);
if (document.body) {
kpxc.observer.observe(document.body, kpxcObserverHelper.observerConfig);
}
};
MutationObserver = window.MutationObserver || window.WebKitMutationObserver;

7
keepassxc-browser/content/ui.js
View file

@ -55,10 +55,13 @@ class Icon {
}
const kpxcUI = {};
kpxcUI.bodyRect = document.body.getBoundingClientRect();
kpxcUI.bodyStyle = getComputedStyle(document.body);
kpxcUI.mouseDown = false;
if (document.body) {
kpxcUI.bodyRect = document.body.getBoundingClientRect();
kpxcUI.bodyStyle = getComputedStyle(document.body);
}
// Wrapper for creating elements
kpxcUI.createElement = function(type, classes, attributes, textContent) {
const element = document.createElement(type);