@@ -321,15 +321,15 @@ def on_header_search_entry_key_release_event(self, _widget, event):
321
321
kname = Gdk .keyval_name (event .keyval )
322
322
323
323
if kname == 'Return' :
324
- self .js_keyboard_event ('html ' , 13 )
324
+ self .js_keyboard_event ('document ' , 13 )
325
325
self .webview .grab_focus ()
326
326
327
327
if kname == 'Down' :
328
- self .js_keyboard_event ('html ' , 40 )
328
+ self .js_keyboard_event ('document ' , 40 )
329
329
self .webview .grab_focus ()
330
330
331
331
if kname == 'Up' :
332
- self .js_keyboard_event ('html ' , 38 )
332
+ self .js_keyboard_event ('document ' , 38 )
333
333
self .webview .grab_focus ()
334
334
335
335
def on_finder_search_entry_key_release_event (self , _widget , event ):
@@ -453,33 +453,37 @@ def js_form_input(self, text):
453
453
var ev = new CustomEvent('input');
454
454
if (fi) { fi.value = '%s' };
455
455
if (fe) { fe.dispatchEvent(ev); }
456
- """
456
+ """ % text
457
457
458
- script = script % text
459
458
self .webview .run_javascript (script )
460
459
461
460
def js_keyboard_event (self , selector , keycode , type = 'keydown' ):
462
461
script = """
463
- var fe = %s ;
462
+ var fe = $('%s') || document ;
464
463
var ev = new KeyboardEvent('%s', { which: %s });
465
464
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 )
470
466
471
467
self .webview .run_javascript (script )
472
468
473
469
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
+
475
475
self .webview .run_javascript (script )
476
476
477
477
def js_open_link (self , link ):
478
478
link = """a[href="/%s"]""" % link .split (self .app_url )[- 1 ]
479
479
self .js_click_element (link )
480
480
481
481
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
+
483
487
self .webview .run_javascript (script , None , self .js_result_value , callback )
484
488
485
489
def js_result_value (self , _webview , result , callback ):
@@ -489,10 +493,14 @@ def js_result_value(self, _webview, result, callback):
489
493
callback (data .to_string ())
490
494
491
495
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 )
494
502
495
- def js_result_visibility (self , _webview , result , callback ):
503
+ def js_result_visible (self , _webview , result , callback ):
496
504
data = self .webview .run_javascript_finish (result )
497
505
data = data .get_js_value ()
498
506
0 commit comments