Skip to content

Commit c3987ab

Browse files
authored
Update NetWebView2Lib.au3
1 parent df13c69 commit c3987ab

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

NetWebView2Lib.au3

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#TODO UDF INDEX
1515

1616
; Global objects
17-
Global $_g_hNetWebView2Lib_DLL = ''
17+
Global $_g_hNetWebView2Lib_DLL = '' ; WIP
18+
Global $_g_bNetWebView2_DebugInfo = True
19+
Global $_g_sNetWebView2_User_JSEvents = ""
20+
Global $_g_sNetWebView2_User_WebViewEvents = ""
1821
Global $_g_oWeb
19-
Global $g_DebugInfo = True
20-
Global $_g_sUser_FnPrefix__NetWebView2_JSEvents = ""
21-
Global $_g_sUser_FnPrefix__NetWebView2_WebViewEvents = ""
2222

2323
#Region ; NetWebView2Lib UDF - core function
2424
Func _NetWebView2_StartUp($sDLLFileFullPath)
@@ -104,7 +104,7 @@ Func _NetWebView2_CreateManager($sUser_FnPrefix = "")
104104
;~ __NetWebView2_ObjName_FlagsValue($oWebV2M)
105105
If @error Then __NetWebView2_Log(@ScriptLineNumber, "! [NetWebView2Lib]: Manager Creation ERROR")
106106

107-
If $sUser_FnPrefix Then $_g_sUser_FnPrefix__NetWebView2_WebViewEvents = $sUser_FnPrefix
107+
If $sUser_FnPrefix Then $_g_sNetWebView2_User_WebViewEvents = $sUser_FnPrefix
108108
ObjEvent($oWebV2M, "__NetWebView2_WebViewEvents__", "IWebViewEvents")
109109
Return SetError(@error, @extended, $oWebV2M)
110110
EndFunc ;==>_NetWebView2_CreateManager
@@ -130,7 +130,7 @@ Func _NetWebView2_GetBridge(ByRef $oWebV2M, $sUser_FnPrefix = "")
130130
Local $oWebJS = $oWebV2M.GetBridge()
131131
If @error Then __NetWebView2_Log(@ScriptLineNumber, "! [NetWebView2Lib]: Manager.GetBridge() ERROR")
132132

133-
If $sUser_FnPrefix Then $_g_sUser_FnPrefix__NetWebView2_JSEvents = $sUser_FnPrefix
133+
If $sUser_FnPrefix Then $_g_sNetWebView2_User_JSEvents = $sUser_FnPrefix
134134
ObjEvent($oWebJS, "__NetWebView2_JSEvents__", "IBridgeEvents")
135135
Return SetError(@error, @extended, $oWebJS)
136136
EndFunc ;==>_NetWebView2_GetBridge
@@ -306,7 +306,7 @@ EndFunc ;==>_NetWebView2_NavigateToString
306306
; Example .......: No
307307
; ===============================================================================================================================
308308
Func __NetWebView2_Log($s_ScriptLineNumber, $sString, $iErrorNoLineNo = 1, $iError = @error, $iExtended = @extended)
309-
If Not $g_DebugInfo Then Return SetError($iError, $iExtended, 0)
309+
If Not $_g_bNetWebView2_DebugInfo Then Return SetError($iError, $iExtended, 0)
310310
If $iErrorNoLineNo = 1 Then
311311
If $iError Then
312312
$sString = "@@ ( NetWebView2Lib UDF : Line=" & $s_ScriptLineNumber & ", @error=" & $iError & ", @extended=" & $iExtended & " ) :: " & $sString
@@ -431,9 +431,9 @@ Func __NetWebView2_WebViewEvents__OnMessageReceived($sMsg)
431431
Case Else
432432
__NetWebView2_Log(@ScriptLineNumber, $s_Prefix & (StringLen($sMsg) > 150 ? StringLeft($sMsg, 150) & "..." : $sMsg), 0)
433433
EndSwitch
434-
If $_g_sUser_FnPrefix__NetWebView2_WebViewEvents Then
435-
#TODO =>>>> Call($_g_sUser_FnPrefix__NetWebView2_WebViewEvents & 'OnMessageReceived', $oWebV2M, $hGUI, $sMsg)
436-
Call($_g_sUser_FnPrefix__NetWebView2_WebViewEvents & 'OnMessageReceived', $sMsg)
434+
If $_g_sNetWebView2_User_WebViewEvents Then
435+
#TODO =>>>> Call($_g_sNetWebView2_User_WebViewEvents & 'OnMessageReceived', $oWebV2M, $hGUI, $sMsg)
436+
Call($_g_sNetWebView2_User_WebViewEvents & 'OnMessageReceived', $sMsg)
437437
EndIf
438438

439439
EndFunc ;==>__NetWebView2_WebViewEvents__OnMessageReceived
@@ -497,9 +497,9 @@ Func __NetWebView2_JSEvents__OnMessageReceived($sMsg)
497497
EndSwitch
498498
EndIf
499499

500-
If $_g_sUser_FnPrefix__NetWebView2_JSEvents Then
501-
#TODO =>>>> Call($_g_sUser_FnPrefix__NetWebView2_JSEvents & 'OnMessageReceived', $oWebV2M, $oWebJS, $hGUI, $sMsg)
502-
Call($_g_sUser_FnPrefix__NetWebView2_JSEvents & 'OnMessageReceived', $sMsg)
500+
If $_g_sNetWebView2_User_JSEvents Then
501+
#TODO =>>>> Call($_g_sNetWebView2_User_JSEvents & 'OnMessageReceived', $oWebV2M, $oWebJS, $hGUI, $sMsg)
502+
Call($_g_sNetWebView2_User_JSEvents & 'OnMessageReceived', $sMsg)
503503
EndIf
504504

505505
EndFunc ;==>__NetWebView2_JSEvents__OnMessageReceived
@@ -511,3 +511,4 @@ Func __NetWebView2_WebViewEvents__OnContextMenuRequested($sLink, $iX, $iY, $sSel
511511
#forceref $oMyError
512512
EndFunc ;==>__NetWebView2_WebViewEvents__OnContextMenuRequested
513513
#EndRegion ; NetWebView2Lib UDF - === EVENT HANDLERS ===
514+

0 commit comments

Comments
 (0)