@@ -56,15 +56,15 @@ Func _WD_NewTab($sSession, $lSwitch = True)
56
56
Local Const $sFuncName = " _WD_NewTab"
57
57
Local $sTabHandle = ' '
58
58
59
- _WDExecuteScript ($sSession , ' window.open()' , ' {}' )
59
+ _WD_ExecuteScript ($sSession , ' window.open()' , ' {}' )
60
60
61
61
If @error = $_WD_ERROR_Success Then
62
- Local $aHandles = _WDWindow ($sSession , ' handles' , ' ' )
62
+ Local $aHandles = _WD_Window ($sSession , ' handles' , ' ' )
63
63
64
64
$sTabHandle = $aHandles [UBound ($aHandles ) - 1 ]
65
65
66
66
If $lSwitch Then
67
- _WDWindow ($sSession , ' Switch' , ' {"handle":"' & $sTabHandle & ' "}' )
67
+ _WD_Window ($sSession , ' Switch' , ' {"handle":"' & $sTabHandle & ' "}' )
68
68
EndIf
69
69
EndIf
70
70
@@ -95,25 +95,25 @@ Func _WD_Attach($sSession, $sString, $sMode = 'title')
95
95
Local Const $sFuncName = " _WD_Attach"
96
96
Local $sTabHandle = ' ' , $lFound = False
97
97
98
- Local $sCurrentTab = _WDWindow ($sSession , ' window' )
99
- Local $aHandles = _WDWindow ($sSession , ' handles' )
98
+ Local $sCurrentTab = _WD_Window ($sSession , ' window' )
99
+ Local $aHandles = _WD_Window ($sSession , ' handles' )
100
100
101
101
$sMode = StringLower ($sMode )
102
102
103
103
For $sHandle In $aHandles
104
104
105
- _WDWindow ($sSession , ' Switch' , ' {"handle":"' & $sHandle & ' "}' )
105
+ _WD_Window ($sSession , ' Switch' , ' {"handle":"' & $sHandle & ' "}' )
106
106
107
107
Switch $sMode
108
108
Case " title" , " url"
109
- If StringInStr (_WDAction ($sSession , $sMode ), $sString ) > 0 Then
109
+ If StringInStr (_WD_Action ($sSession , $sMode ), $sString ) > 0 Then
110
110
$lFound = True
111
111
$sTabHandle = $sHandle
112
112
ExitLoop
113
113
EndIf
114
114
115
115
Case ' html'
116
- If StringInStr (_WDGetSource ($sSession ), $sString ) > 0 Then
116
+ If StringInStr (_WD_GetSource ($sSession ), $sString ) > 0 Then
117
117
$lFound = True
118
118
$sTabHandle = $sHandle
119
119
ExitLoop
@@ -127,7 +127,7 @@ Func _WD_Attach($sSession, $sString, $sMode = 'title')
127
127
128
128
If Not $lFound Then
129
129
; Restore prior active tab
130
- _WDWindow ($sSession , ' Switch' , ' {"handle":"' & $sCurrentTab & ' "}' )
130
+ _WD_Window ($sSession , ' Switch' , ' {"handle":"' & $sCurrentTab & ' "}' )
131
131
SetError (__WD_Error($sFuncName , $_WD_ERROR_NoMatch ))
132
132
EndIf
133
133
0 commit comments