Skip to content

Commit 25a6fa4

Browse files
committed
optimize run_javascript functions
1 parent f480a18 commit 25a6fa4

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

devdocs_desktop.py

+23-15
Original file line numberDiff line numberDiff line change
@@ -321,15 +321,15 @@ def on_header_search_entry_key_release_event(self, _widget, event):
321321
kname = Gdk.keyval_name(event.keyval)
322322

323323
if kname == 'Return':
324-
self.js_keyboard_event('html', 13)
324+
self.js_keyboard_event('document', 13)
325325
self.webview.grab_focus()
326326

327327
if kname == 'Down':
328-
self.js_keyboard_event('html', 40)
328+
self.js_keyboard_event('document', 40)
329329
self.webview.grab_focus()
330330

331331
if kname == 'Up':
332-
self.js_keyboard_event('html', 38)
332+
self.js_keyboard_event('document', 38)
333333
self.webview.grab_focus()
334334

335335
def on_finder_search_entry_key_release_event(self, _widget, event):
@@ -453,33 +453,37 @@ def js_form_input(self, text):
453453
var ev = new CustomEvent('input');
454454
if (fi) { fi.value = '%s' };
455455
if (fe) { fe.dispatchEvent(ev); }
456-
"""
456+
""" % text
457457

458-
script = script % text
459458
self.webview.run_javascript(script)
460459

461460
def js_keyboard_event(self, selector, keycode, type='keydown'):
462461
script = """
463-
var fe = %s;
462+
var fe = $('%s') || document;
464463
var ev = new KeyboardEvent('%s', { which: %s });
465464
if (fe) { fe.dispatchEvent(ev); }
466-
"""
467-
468-
target = 'document' if selector == 'html' else "$('%s')" % selector
469-
script = script % (target, type, keycode)
465+
""" % (selector, type, keycode)
470466

471467
self.webview.run_javascript(script)
472468

473469
def js_click_element(self, selector):
474-
script = "var sl = $('%s'); if (sl) { sl.click(); }" % selector
470+
script = """
471+
var el = $('%s');
472+
if (el) { el.click(); }
473+
""" % selector
474+
475475
self.webview.run_javascript(script)
476476

477477
def js_open_link(self, link):
478478
link = """a[href="/%s"]""" % link.split(self.app_url)[-1]
479479
self.js_click_element(link)
480480

481481
def js_element_value(self, selector, callback):
482-
script = "var sl = $('%s'); if (sl) { sl.value || sl.innerText; }" % selector
482+
script = """
483+
var el = $('%s');
484+
if (el) { el.value || el.innerText; }
485+
""" % selector
486+
483487
self.webview.run_javascript(script, None, self.js_result_value, callback)
484488

485489
def js_result_value(self, _webview, result, callback):
@@ -489,10 +493,14 @@ def js_result_value(self, _webview, result, callback):
489493
callback(data.to_string())
490494

491495
def js_element_visible(self, selector, callback):
492-
script = "var sl = $('%s'); if (sl) { window.getComputedStyle(sl).display !== 'none'; }" % selector
493-
self.webview.run_javascript(script, None, self.js_result_visibility, callback)
496+
script = """
497+
var el = $('%s');
498+
if (el) { window.getComputedStyle(el).display !== 'none'; }
499+
""" % selector
500+
501+
self.webview.run_javascript(script, None, self.js_result_visible, callback)
494502

495-
def js_result_visibility(self, _webview, result, callback):
503+
def js_result_visible(self, _webview, result, callback):
496504
data = self.webview.run_javascript_finish(result)
497505
data = data.get_js_value()
498506

0 commit comments

Comments
 (0)