rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't access caretElement if it's gone

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-08 15:51:42 +02:00
parent 8c0366f0a7
commit 45eece372f
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/javascript/caret.js
View File

@ -1271,14 +1271,18 @@ window._qutebrowser.caret = (function() {
}; };
CaretBrowsing.startAnimation = function() { CaretBrowsing.startAnimation = function() {
CaretBrowsing.caretElement.style.animationIterationCount = "infinite"; if (CaretBrowsing.caretElement) {
CaretBrowsing.caretElement.style.animationIterationCount = "infinite";
}
}; };
CaretBrowsing.stopAnimation = function() { CaretBrowsing.stopAnimation = function() {
CaretBrowsing.caretElement.style.animationIterationCount = 0; if (CaretBrowsing.caretElement) {
window.setTimeout(() => { CaretBrowsing.caretElement.style.animationIterationCount = 0;
CaretBrowsing.startAnimation(); window.setTimeout(() => {
}, 1000); CaretBrowsing.startAnimation();
}, 1000);
}
}; };
CaretBrowsing.init = function() { CaretBrowsing.init = function() {

16
tests/helpers/fixtures.py
View File

@ -156,11 +156,12 @@ def greasemonkey_manager(data_tmpdir):
def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager, def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
session_manager_stub, greasemonkey_manager, fake_args, session_manager_stub, greasemonkey_manager, fake_args,
host_blocker_stub, config_stub): host_blocker_stub, config_stub):
# Make sure error logging via JS fails tests
config_stub.val.content.javascript.log = { config_stub.val.content.javascript.log = {
'info': 'info', 'info': 'info',
'error': 'info', 'error': 'error',
'unknown': 'info', 'unknown': 'error',
'warning': 'info' 'warning': 'error',
} }
webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab') webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab')
@ -185,12 +186,13 @@ def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
def webengine_tab(qtbot, tab_registry, fake_args, mode_manager, def webengine_tab(qtbot, tab_registry, fake_args, mode_manager,
session_manager_stub, greasemonkey_manager, session_manager_stub, greasemonkey_manager,
redirect_webengine_data, tabbed_browser_stubs, redirect_webengine_data, tabbed_browser_stubs,
config_stub): config_stub, qapp):
# Make sure error logging via JS fails tests
config_stub.val.content.javascript.log = { config_stub.val.content.javascript.log = {
'info': 'info', 'info': 'info',
'error': 'info', 'error': 'error',
'unknown': 'info', 'unknown': 'error',
'warning': 'info' 'warning': 'error',
} }
tabwidget = tabbed_browser_stubs[0].widget tabwidget = tabbed_browser_stubs[0].widget