Skip to content

Commit 07aad52

Browse files
Merge pull request #517 from smasterson/fix-tablepercentagebar
2 parents 2c61f15 + 2b50f12 commit 07aad52

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Private/New-TablePercentageBarInternal.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
)
6060

6161
if ($ConditionalFormatting) {
62-
$JsonConditions = $ConditionalFormatting | ConvertTo-Json
62+
$JsonConditions = $ConditionalFormatting | ConvertTo-Json -Compress
6363
[ordered]@{
6464
targets = $ColumnID
6565
render = "`$.fn.dataTable.render.percentBar('$Type','$TextColor', '$BorderColor', '$BarColor', '$BackgroundColor', $RoundValue, '$BorderStyle', $JsonConditions)"
@@ -70,4 +70,4 @@
7070
render = "`$.fn.dataTable.render.percentBar('$Type','$TextColor', '$BorderColor', '$BarColor', '$BackgroundColor', $RoundValue, '$BorderStyle')"
7171
}
7272
}
73-
}
73+
}

Public/New-HTMLTable.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,12 @@
12851285
# Before: "display": "$.fn.dataTable.Responsive.display.childRowImmediate"
12861286
# After: "display": $.fn.dataTable.Responsive.display.childRowImmediate
12871287
$Options = $Options -replace '"(\$\.fn\.dataTable\.Responsive\.display\.childRowImmediate)"', '$1'
1288-
$Options = $Options -replace '"(\$\.fn\.dataTable\.render\.percentBar\(.+\))"', '$1'
1288+
# $Options = $Options -replace '"(\$\.fn\.dataTable\.render\.percentBar\(.+\))"', '$1'
1289+
$Options = [regex]::Replace(
1290+
$Options,
1291+
'(?s)"(\$\.fn\.dataTable\.render\.percentBar\(.+?\))"',
1292+
{ param($m) ($m.Groups[1].Value -replace '\\\"', '"' -replace '\\u0027', "'" ) }
1293+
)
12891294
# we need to cleanup $Options for columnDefs/render, remove \r\n
12901295
#$Options = $Options -replace '\\r\\n', '\r\n' #-replace "\\`"",'"'
12911296

0 commit comments

Comments
 (0)