Skip to content

Commit c1e416a

Browse files
committed
use single method to dispatch js functions
1 parent 930a4c5 commit c1e416a

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

devdocs_desktop.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -463,29 +463,27 @@ def on_webview_context_menu(self, _widget, menu, _coords, _keyboard):
463463
if action == actions.OPEN_LINK:
464464
item.get_action().connect('activate', self.on_webview_open_link)
465465

466-
def js_form_input(self, text):
467-
script = """desktop.search('%s')""" % text
466+
def run_javascript(self, method, *args):
467+
script = """desktop.run('%s', %s)""" % (method, list(args))
468468
self.webview.run_javascript(script)
469469

470+
def js_form_input(self, text):
471+
self.run_javascript('search', text)
472+
470473
def js_keyboard_event(self, selector, keycode, type='keydown'):
471-
script = """desktop.sendKey('%s', '%s', %s)""" % (selector, type, keycode)
472-
self.webview.run_javascript(script)
474+
self.run_javascript('sendKey', selector, type, keycode)
473475

474476
def js_click_element(self, selector):
475-
script = """desktop.click('%s')""" % selector
476-
self.webview.run_javascript(script)
477+
self.run_javascript('click', selector)
477478

478479
def js_open_link(self, link):
479-
script = """desktop.navigate('%s', '%s')""" % (self.app_url, link)
480-
self.webview.run_javascript(script)
480+
self.run_javascript('navigate', self.app_url, link)
481481

482482
def js_element_value(self, selector, callback):
483-
script = """desktop.getValue('%s', '%s')""" % (selector, callback)
484-
self.webview.run_javascript(script)
483+
self.run_javascript('getValue', selector, callback)
485484

486485
def js_element_visible(self, selector, callback):
487-
script = """desktop.isVisible('%s', '%s')""" % (selector, callback)
488-
self.webview.run_javascript(script)
486+
self.run_javascript('isVisible', selector, callback)
489487

490488

491489
class DevdocsDesktopService(dbus.service.Object):

scripts/webview.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ class DevDocsDesktop {
1515
}
1616
}
1717

18+
run(method, args) {
19+
this[method].call(this, ...args)
20+
}
21+
1822
onElement(ref, callback) {
1923
const element = this.ref(ref)
2024

0 commit comments

Comments
 (0)