@@ -703,7 +703,6 @@ EndFunc ;==>_WD_IsWindowTop
703
703
; Return values .: Success - True.
704
704
; Failure - WD Response error message (E.g. "no such frame") and sets @error to one of the following values:
705
705
; - $_WD_ERROR_Exception
706
- ; - $_WD_ERROR_InvalidArgue
707
706
; Author ........: Decibel
708
707
; Modified ......: Danp2, mLipok, jchd
709
708
; Remarks .......: You can drill-down into nested frames by calling this function repeatedly or use identifier like 'null/2/0'
@@ -729,34 +728,27 @@ Func _WD_FrameEnter($sSession, $vIdentifier)
729
728
ElseIf IsInt ($vIdentifier ) Then
730
729
$sOption = ' {"id":' & $vIdentifier & ' }'
731
730
Else
732
- _WinAPI_GUIDFromString(" {" & $vIdentifier & " }" )
733
- If @error Then
734
- $iErr = $_WD_ERROR_InvalidArgue
735
- Else
736
- $sOption = ' {"id":' & __WD_JsonElement($vIdentifier ) & ' }'
737
- EndIf
731
+ $sOption = ' {"id":' & __WD_JsonElement($vIdentifier ) & ' }'
738
732
EndIf
739
733
740
- If $iErr = $_WD_ERROR_Success Then ; check if $vIdentifier was succesfully validated
741
- If Not $bIdentifierAsPath Then
742
- $sResponse = _WD_Window($sSession , " frame" , $sOption )
743
- $iErr = @error
744
- Else
745
- Local $aIdentifiers = StringSplit ($vIdentifier , ' /' )
746
- For $i = 1 To $aIdentifiers [0 ]
747
- If String ($aIdentifiers [$i ]) = ' null' Then
748
- $aIdentifiers [$i ] = ' {"id":null}'
749
- Else
750
- $aIdentifiers [$i ] = ' {"id":' & $aIdentifiers [$i ] & ' }'
751
- EndIf
752
- $sResponse = _WD_Window($sSession , " frame" , $aIdentifiers [$i ])
753
- If Not @error Then ContinueLoop
734
+ If Not $bIdentifierAsPath Then
735
+ $sResponse = _WD_Window($sSession , " frame" , $sOption )
736
+ $iErr = @error
737
+ Else
738
+ Local $aIdentifiers = StringSplit ($vIdentifier , ' /' )
739
+ For $i = 1 To $aIdentifiers [0 ]
740
+ If String ($aIdentifiers [$i ]) = ' null' Then
741
+ $aIdentifiers [$i ] = ' {"id":null}'
742
+ Else
743
+ $aIdentifiers [$i ] = ' {"id":' & $aIdentifiers [$i ] & ' }'
744
+ EndIf
745
+ $sResponse = _WD_Window($sSession , " frame" , $aIdentifiers [$i ])
746
+ If Not @error Then ContinueLoop
754
747
755
- $iErr = @error
756
- $sMessage = ' Error on ID#' & $i & ' > ' & $aIdentifiers [$i ]
757
- ExitLoop
758
- Next
759
- EndIf
748
+ $iErr = @error
749
+ $sMessage = ' Error on ID#' & $i & ' > ' & $aIdentifiers [$i ]
750
+ ExitLoop
751
+ Next
760
752
EndIf
761
753
762
754
If $iErr = $_WD_ERROR_Success Then
@@ -769,7 +761,7 @@ Func _WD_FrameEnter($sSession, $vIdentifier)
769
761
Else
770
762
$sValue = True
771
763
EndIf
772
- ElseIf $iErr <> $_WD_ERROR_InvalidArgue And Not $_WD_DetailedErrors Then
764
+ ElseIf Not $_WD_DetailedErrors Then
773
765
$iErr = $_WD_ERROR_Exception
774
766
EndIf
775
767
0 commit comments