QtWebEngine: Make :open-editor work

This commit is contained in:
Florian Bruhin 2016-08-09 16:00:59 +02:00
parent ca67e2be3c
commit fefea4944a
4 changed files with 11 additions and 7 deletions

View File

@ -1424,8 +1424,7 @@ class CommandDispatcher:
ed.edit(text)
@cmdutils.register(instance='command-dispatcher',
modes=[KeyMode.insert], hide=True, scope='window',
backend=usertypes.Backend.QtWebKit)
modes=[KeyMode.insert], hide=True, scope='window')
def open_editor(self):
"""Open an external editor with the currently selected form field.

View File

@ -24,7 +24,7 @@
from PyQt5.QtCore import QRect
from qutebrowser.utils import log
from qutebrowser.utils import log, javascript
from qutebrowser.browser import webelem
@ -32,9 +32,10 @@ class WebEngineElement(webelem.AbstractWebElement):
"""A web element for QtWebEngine, using JS under the hood."""
def __init__(self, js_dict):
def __init__(self, js_dict, run_js_callable):
self._id = js_dict['id']
self._js_dict = js_dict
self._run_js = run_js_callable
def __eq__(self, other):
if not isinstance(other, WebEngineElement):
@ -117,7 +118,8 @@ class WebEngineElement(webelem.AbstractWebElement):
content-editable.
"""
# FIXME:qtwebengine what to do about use_js with WebEngine?
log.stub()
js_code = javascript.assemble('webelem', 'set_text', self._id, text)
self._run_js(js_code)
def set_inner_xml(self, xml):
"""Set the given inner XML."""

View File

@ -446,7 +446,7 @@ class WebEngineTab(browsertab.AbstractTab):
"""
elems = []
for js_elem in js_elems:
elem = webengineelem.WebEngineElement(js_elem)
elem = webengineelem.WebEngineElement(js_elem, self.run_js_async)
elems.append(elem)
callback(elems)
@ -467,7 +467,8 @@ class WebEngineTab(browsertab.AbstractTab):
if js_elem is None:
callback(None)
else:
callback(webengineelem.WebEngineElement(js_elem))
elem = webengineelem.WebEngineElement(js_elem, self.run_js_async)
callback(elem)
def find_focus_element(self, callback):
js_code = javascript.assemble('webelem', 'focus_element')

View File

@ -72,6 +72,8 @@ window._qutebrowser.webelem = (function() {
return serialize_elem(elem, id);
};
funcs.set_text = function(id, text) {
elements[id].value = text;
};
return funcs;