Skip to content

Commit c67f323

Browse files
committed
version update
Fixed issue where   was not converted to Chr(32) in TableToArray method of WebDriver class [@hanamichi77777] Fixed host crashing bug in WebActionChain class (twinBASIC 32-bit ActiveX DLL only) Replacement of VBScript RegExp with @sihlfall's vba-regex at: https://github.com/sihlfall/vba-regex (twinBASIC ActiveX DLL only - experimental)
1 parent 8747469 commit c67f323

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4537
-134
lines changed

dist/SeleniumVBA.accdb

0 Bytes
Binary file not shown.

dist/SeleniumVBA.xlsm

-137 Bytes
Binary file not shown.

dist/SeleniumVBADLLSetup.exe

83.7 KB
Binary file not shown.

src/VBA/ClassFactory.bas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Attribute VB_Description = "This class is used for object instantiation when ref
33
'@ModuleDescription "This class is used for object instantiation when referencing SeleniumVBA externally from another code project"
44
'@folder("SeleniumVBA.Source")
55
' ==========================================================================
6-
' SeleniumVBA v6.0
6+
' SeleniumVBA v6.1
77
'
88
' A Selenium wrapper for browser automation developed for MS Office VBA
99
'

src/VBA/WebActionChain.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class is used to emulate a human interaction se
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'

src/VBA/WebAlert.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class is used to manage browser alerts - must b
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'

src/VBA/WebCapabilities.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class is used to manage/set Selenium optional C
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'

src/VBA/WebCookie.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class is used to manage/modify a cookie object"
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'

src/VBA/WebCookies.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class is used to manage a collection of cookie
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'

src/VBA/WebDriver.cls

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Attribute VB_Description = "This class provides the main mechanism to control/au
1212
'@Exposed
1313
'@folder("SeleniumVBA.Source")
1414
' ==========================================================================
15-
' SeleniumVBA v6.0
15+
' SeleniumVBA v6.1
1616
'
1717
' A Selenium wrapper for browser automation developed for MS Office VBA
1818
'
@@ -3455,10 +3455,10 @@ Private Function getJavaScript(ByVal scriptName As String) As String
34553455
script = script & " // Store the contents of the cell in output array" & vbCrLf
34563456
script = script & " if (ignoreCellFormatting) {" & vbCrLf
34573457
script = script & " // Store the complete text content, including hidden text" & vbCrLf
3458-
script = script & " v[row.rowIndex][colIdx] = cell.textContent;}" & vbCrLf
3458+
script = script & " v[row.rowIndex][colIdx] = cell.textContent.replace(/\xA0/g,' ');}" & vbCrLf
34593459
script = script & " else {" & vbCrLf
34603460
script = script & " // Store the visible text content, including <br>'s and other formatting" & vbCrLf
3461-
script = script & " v[row.rowIndex][colIdx] = cell.innerText;" & vbCrLf
3461+
script = script & " v[row.rowIndex][colIdx] = cell.innerText.replace(/\xA0/g,' ');" & vbCrLf
34623462
script = script & " }" & vbCrLf
34633463
script = script & vbCrLf
34643464
script = script & " if (createSpanData) {" & vbCrLf
@@ -3468,11 +3468,7 @@ Private Function getJavaScript(ByVal scriptName As String) As String
34683468
script = script & " if (colSpan > 1) {" & vbCrLf
34693469
script = script & " // Propogate column span data" & vbCrLf
34703470
script = script & " for (let i = 1; i < colSpan; i++) {" & vbCrLf
3471-
script = script & " if (ignoreCellFormatting) {" & vbCrLf
3472-
script = script & " v[row.rowIndex][colIdx + i] = cell.textContent;}" & vbCrLf
3473-
script = script & " else {" & vbCrLf
3474-
script = script & " v[row.rowIndex][colIdx + i] = cell.innerText;" & vbCrLf
3475-
script = script & " }" & vbCrLf
3471+
script = script & " v[row.rowIndex][colIdx + i] = v[row.rowIndex][colIdx];" & vbCrLf
34763472
script = script & " }" & vbCrLf
34773473
script = script & " colIdx += colSpan - 1;" & vbCrLf
34783474
script = script & " }" & vbCrLf

0 commit comments

Comments
 (0)