diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index a931eb66e..aa8ce3502 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1653,7 +1653,7 @@ class CommandDispatcher: try: elem.set_value(text) # Kick off js handlers to trick them into thinking there was input. - elem.dispatch_event("input") + elem.dispatch_event("input", bubbles=True) except webelem.OrphanedError: message.error('Edited element vanished') ed.backup() diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py index 621ec91e2..5ff59653b 100644 --- a/qutebrowser/browser/webelem.py +++ b/qutebrowser/browser/webelem.py @@ -139,8 +139,16 @@ class AbstractWebElement(collections.abc.MutableMapping): """Set the element value.""" raise NotImplementedError - def dispatch_event(self, event): - """Set the element value.""" + def dispatch_event(self, event, bubbles=False, + cancelable=False, composed=False): + """Dispatch an event to the element. + + Args: + bubbles: Whether this event should bubble. + cancelable: Whether this event can be cancelled. + composed: Whether the event will trigger listeners outside of a + shadow root + """ raise NotImplementedError def insert_text(self, text): diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py index 44176cf73..ad23c9337 100644 --- a/qutebrowser/browser/webengine/webengineelem.py +++ b/qutebrowser/browser/webengine/webengineelem.py @@ -135,8 +135,10 @@ class WebEngineElement(webelem.AbstractWebElement): def set_value(self, value): self._js_call('set_value', value) - def dispatch_event(self, event): - self._js_call('dispatch_event', event) + + def dispatch_event(self, event, bubbles=False, + cancelable=False, composed=False): + self._js_call('dispatch_event', event, bubbles, cancelable, composed) def caret_position(self): """Get the text caret position for the current element. diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py index 81cb24780..151cdb1dc 100644 --- a/qutebrowser/browser/webkit/webkitelem.py +++ b/qutebrowser/browser/webkit/webkitelem.py @@ -128,13 +128,16 @@ class WebKitElement(webelem.AbstractWebElement): value = javascript.string_escape(value) self._elem.evaluateJavaScript("this.value='{}'".format(value)) - def dispatch_event(self, event): + def dispatch_event(self, event, bubbles=False, + cancelable=False, composed=False): self._check_vanished() - if self._tab.is_deleted(): - raise webelem.OrphanedError("Tab containing element vanished") log.webelem.debug("Firing event on {!r} via javascript.".format(self)) - self._elem.evaluateJavaScript("this.dispatchEvent(new Event('{}'))" - .format(event)) + event = javascript.string_escape(event) + self._elem.evaluateJavaScript( + "this.dispatchEvent(new Event('{}', " + "{{'bubbles': {}, 'cancelable': {}, 'composed': {}}}))" + .format(event, str(bubbles).lower(), str(cancelable).lower(), + str(composed).lower())) def caret_position(self): """Get the text caret position for the current element.""" diff --git a/qutebrowser/javascript/.eslintrc.yaml b/qutebrowser/javascript/.eslintrc.yaml index 9e99b0aa5..cb1bb1fcb 100644 --- a/qutebrowser/javascript/.eslintrc.yaml +++ b/qutebrowser/javascript/.eslintrc.yaml @@ -59,3 +59,4 @@ rules: multiline-ternary: ["error", "always-multiline"] max-lines-per-function: "off" require-unicode-regexp: "off" + max-params: "off" diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 3f858f3fb..a6da3aa71 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -1,5 +1,5 @@ /* eslint-disable max-len, max-statements, complexity, -max-params, default-case, valid-jsdoc */ +default-case, valid-jsdoc */ // Copyright 2014 The Chromium Authors. All rights reserved. // diff --git a/qutebrowser/javascript/webelem.js b/qutebrowser/javascript/webelem.js index 5b1a0679b..7c7e9ad09 100644 --- a/qutebrowser/javascript/webelem.js +++ b/qutebrowser/javascript/webelem.js @@ -362,9 +362,14 @@ window._qutebrowser.webelem = (function() { document.execCommand("insertText", false, text); }; - funcs.dispatch_event = (id, event) => { + + funcs.dispatch_event = (id, event, bubbles = false, + cancelable = false, composed = false) => { const elem = elements[id]; - elem.dispatchEvent(new Event(event)); + elem.dispatchEvent( + new Event(event, {"bubbles": bubbles, + "cancelable": cancelable, + "composed": composed})); }; funcs.set_attribute = (id, name, value) => {