Revert "merge recent changes"

PSWriteHTML.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Przemyslaw Klys
 #
-# Generated on: 27.07.2020
+# Generated on: 23.07.2020
 #
 
 @{
@@ -12,7 +12,7 @@
     RootModule           = 'PSWriteHTML.psm1'
 
     # Version number of this module.
-    ModuleVersion        = '0.0.90'
+    ModuleVersion        = '0.0.89'
 
     # Supported PSEditions
     CompatiblePSEditions = 'Desktop', 'Core'
@@ -51,7 +51,7 @@
     # ProcessorArchitecture = ''
 
     # Modules that must be imported into the global environment prior to importing this module
-    RequiredModules      = @(@{ModuleName = 'PSSharedGoods'; GUID = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'; ModuleVersion = '0.0.161'; })
+    RequiredModules      = @(@{ModuleName = 'PSSharedGoods'; GUID = 'ee272aa8-baaa-4edf-9f45-b6d6f7d844fe'; ModuleVersion = '0.0.160'; })
 
     # Assemblies that must be loaded prior to importing this module
     # RequiredAssemblies = @()
@@ -92,9 +92,9 @@
     'New-HTMLTimelineItem', 'New-HTMLToast', 'New-HTMLTree', 
     'New-TableButtonCopy', 'New-TableButtonCSV', 'New-TableButtonExcel', 
     'New-TableButtonPageLength', 'New-TableButtonPDF', 
-    'New-TableButtonPrint', 'New-TableColumnOption', 'New-TableCondition', 
-    'New-TableContent', 'New-TableHeader', 'New-TableReplace', 
-    'New-TableRowGrouping', 'New-TreeNode', 'Out-HtmlView', 'Save-HTML'
+    'New-TableButtonPrint', 'New-TableCondition', 'New-TableContent', 
+    'New-TableHeader', 'New-TableReplace', 'New-TableRowGrouping', 
+    'New-TreeNode', 'Out-HtmlView', 'Save-HTML'
 
     # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
     CmdletsToExport      = @()
@@ -123,14 +123,13 @@
     'New-HTMLTableButtonPageLength', 'TableButtonPDF', 
     'EmailTableButtonPDF', 'New-HTMLTableButtonPDF', 'TableButtonPrint', 
     'EmailTableButtonPrint', 'New-HTMLTableButtonPrint', 
-    'EmailTableColumnOption', 'TableColumnOption', 
-    'New-HTMLTableColumnOption', 'EmailTableCondition', 
-    'TableConditionalFormatting', 'New-HTMLTableCondition', 
-    'TableCondition', 'TableContent', 'EmailTableContent', 
-    'New-HTMLTableContent', 'TableHeader', 'EmailTableHeader', 
-    'New-HTMLTableHeader', 'TableReplace', 'EmailTableReplace', 
-    'New-HTMLTableReplace', 'TableRowGrouping', 'EmailTableRowGrouping', 
-    'New-HTMLTableRowGrouping', 'Out-GridHtml', 'ohv'
+    'EmailTableCondition', 'TableConditionalFormatting', 
+    'New-HTMLTableCondition', 'TableCondition', 'TableContent', 
+    'EmailTableContent', 'New-HTMLTableContent', 'TableHeader', 
+    'EmailTableHeader', 'New-HTMLTableHeader', 'TableReplace', 
+    'EmailTableReplace', 'New-HTMLTableReplace', 'TableRowGrouping', 
+    'EmailTableRowGrouping', 'New-HTMLTableRowGrouping', 'Out-GridHtml', 
+    'ohv'
 
     # DSC resources to export from this module
     # DscResourcesToExport = @()

Private/Parameters.Configuration.ps1

@@ -260,6 +260,73 @@ $Script:Configuration = [ordered] @{
                 JS      = "$PSScriptRoot\..\Resources\JS\fullCalendar.js"
             }
         }
+        <#
+        FullCalendarCore        = @{
+            Comment = 'FullCalendar Core'
+            Header  = @{
+                CssLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@4.3.1/main.min.css'
+                Css     = "$PSScriptRoot\..\Resources\CSS\fullCalendarCore.css"
+                JSLink  = 'https://cdn.jsdelivr.net/npm/@fullcalendar/core@4.3.1/main.min.js'
+                JS      = "$PSScriptRoot\..\Resources\JS\fullCalendarCore.js"
+            }
+
+        }
+        FullCalendarDayGrid     = @{
+            Comment = 'FullCalendar DayGrid'
+            Header  = @{
+                CssLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@4.3.0/main.min.css'
+                Css     = "$PSScriptRoot\..\Resources\CSS\fullCalendarDayGrid.css"
+                JSLink  = 'https://cdn.jsdelivr.net/npm/@fullcalendar/daygrid@4.3.0/main.min.js'
+                JS      = "$PSScriptRoot\..\Resources\JS\fullCalendarDayGrid.js"
+            }
+
+        }
+        FullCalendarInteraction = @{
+            Comment = 'FullCalendar Interaction'
+            Header  = @{
+                JSLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/interaction@4.3.0/main.min.js'
+                JS     = "$PSScriptRoot\..\Resources\JS\FullCalendarInteraction.js"
+            }
+
+        }
+        FullCalendarList        = @{
+            Comment = 'FullCalendar List'
+            Header  = @{
+                CssLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/list@4.3.0/main.min.css'
+                Css     = "$PSScriptRoot\..\Resources\CSS\fullCalendarList.css"
+                JSLink  = 'https://cdn.jsdelivr.net/npm/@fullcalendar/list@4.3.0/main.min.js'
+                JS      = "$PSScriptRoot\..\Resources\JS\fullCalendarList.js"
+            }
+
+        }
+        FullCalendarRRule       = @{
+            Comment = 'FullCalendar RRule'
+            Header  = @{
+                JSLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/rrule'
+                JS     = "$PSScriptRoot\..\Resources\JS\fullCalendarRRule.js"
+                #https://cdn.jsdelivr.net/npm/@fullcalendar/rrule@4.3.0/main.min.js
+            }
+        }
+        FullCalendarTimeGrid    = @{
+            Comment = 'FullCalendar TimeGrid'
+            Header  = @{
+                CssLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@4.3.0/main.min.css'
+                Css     = "$PSScriptRoot\..\Resources\CSS\fullCalendarTimeGrid.css"
+                JSLink  = 'https://cdn.jsdelivr.net/npm/@fullcalendar/timegrid@4.3.0/main.min.js'
+                JS      = "$PSScriptRoot\..\Resources\JS\fullCalendarTimeGrid.js"
+            }
+        }
+        FullCalendarTimeLine    = @{
+            Comment = 'FullCalendar TimeLine'
+            Header  = @{
+                CssLink = 'https://cdn.jsdelivr.net/npm/@fullcalendar/timeline@4.3.0/main.min.css'
+                Css     = "$PSScriptRoot\..\Resources\CSS\fullCalendarTimeLine.css"
+                JSLink  = 'https://cdn.jsdelivr.net/npm/@fullcalendar/timeline@4.3.0/main.min.js'
+                JS      = "$PSScriptRoot\..\Resources\JS\fullCalendarTimeLine.js"
+            }
+
+        }
+        #>
         HideSection          = @{
             Comment      = 'Hide Section Code'
             HeaderAlways = @{
@@ -281,10 +348,10 @@ $Script:Configuration = [ordered] @{
             Header  = @{
                 JSLink = @(
                     'https://cdnjs.cloudflare.com/ajax/libs/raphael/2.3.0/raphael.min.js'
-                    'https://cdnjs.cloudflare.com/ajax/libs/justgage/1.3.5/justgage.min.js'
+                    'https://cdnjs.cloudflare.com/ajax/libs/justgage/1.3.3/justgage.min.js'
                 )
                 JS     = @(
-                    "$PSScriptRoot\..\Resources\JS\raphael.min.js"
+                    "$PSScriptRoot\..\Resources\JS\raphael-min.js"
                     "$PSScriptRoot\..\Resources\JS\justgage.min.js"
                 )
             }
@@ -454,5 +521,6 @@ function Save-Resource {
 #Save-Resource -ResourceLinks $($Script:Configuration).Features.ChartsApex.Header.JsLink -Type 'JS'
 #Save-Resource -ResourceLinks $($Script:Configuration).Features.ChartsApex.Header.CssLink -Type 'CSS'
 
-#Save-Resource -ResourceLinks $($Script:Configuration).Features.JustGage.Header.JsLink -Type 'JS' -Target $($Script:Configuration).Features.JustGage.Header.Js -Verbose
-#Save-Resource -ResourceLinks $($Script:Configuration).Features.JustGage.Header.CssLink -Type 'CSS' -Target $($Script:Configuration).Features.JustGage.Header.Css -Verbose
+
+#Save-Resource -ResourceLinks $($Script:Configuration).Features.FullCalendar.Header.JsLink -Type 'JS' -Target $($Script:Configuration).Features.FullCalendar.Header.Js -Verbose
+#Save-Resource -ResourceLinks $($Script:Configuration).Features.FullCalendar.Header.CssLink -Type 'CSS' -Target $($Script:Configuration).Features.FullCalendar.Header.Css -Verbose

Public/New-HTMLTable.ps1

@@ -58,7 +58,6 @@ function New-HTMLTable {
         [alias('RegularExpression')][switch]$SearchRegularExpression,
         [ValidateSet('normal', 'break-all', 'keep-all', 'break-word')][string] $WordBreak = 'normal',
         [switch] $AutoSize,
-        [switch] $DisableAutoWidthOptimization,
         [string] $Title
     )
     if (-not $Script:HTMLSchema.Features) {
@@ -77,10 +76,6 @@ function New-HTMLTable {
     $ContentTop = [System.Collections.Generic.List[PSCustomObject]]::new()
     $ContentFormattingInline = [System.Collections.Generic.List[PSCustomObject]]::new()
     $ReplaceCompare = [System.Collections.Generic.List[System.Collections.IDictionary]]::new()
-    $TableColumnOptions = [System.Collections.Generic.List[PSCustomObject]]::new()
-
-    # This will be used to store the colulmnDef option for the datatable
-    $ColumnDefinitionList = [System.Collections.Generic.List[PSCustomObject]]::New()
     $RowGrouping = @{ }
 
     if ($HTML) {
@@ -124,8 +119,6 @@ function New-HTMLTable {
                     $ReplaceCompare.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableRowGrouping') {
                     $RowGrouping = $Parameters.Output
-                } elseif ($Parameters.Type -eq 'TableColumnOption') {
-                    $TableColumnOptions.Add($Parameters.Output)
                 }
             }
         }
@@ -447,35 +440,20 @@ function New-HTMLTable {
             foreach ($_ in $ResponsivePriorityOrder) {
                 $Index = [array]::indexof($HeaderNames.ToUpper(), $_.ToUpper())
                 if ($Index -ne -1) {
-                    [pscustomobject]@{ responsivePriority = 0; targets = $Index }
+                    @{ responsivePriority = 0; targets = $Index }
                 }
             }
             foreach ($_ in $ResponsivePriorityOrderIndex) {
-                [pscustomobject]@{ responsivePriority = 0; targets = $_ }
+                @{ responsivePriority = 0; targets = $_ }
+            }
+        )
+        $Options.columnDefs = @(
+            foreach ($_ in $PriorityOrderBinding) {
+                $PriorityOrder++
+                $_.responsivePriority = $PriorityOrder
+                $_
             }
         )
-
-        foreach ($_ in $PriorityOrderBinding) {
-            $PriorityOrder++
-            $_.responsivePriority = $PriorityOrder
-            $ColumnDefinitionList.Add($_)
-        }
-    }
-
-    # The table column options also adds to the columnDefs parameter
-    If ($TableColumnOptions.Count -gt 0) {
-        foreach ($_ in $TableColumnOptions) {
-            $ColumnDefinitionList.Add($_)
-        }
-    }
-
-    # If we have a column definition list defined, then set the columnDefs option
-    If ($ColumnDefinitionList.Count -gt 0) {
-        $Options.columnDefs = $ColumnDefinitionList.ToArray()
-    }
-
-    If ($DisableAutoWidthOptimization) {
-        $Options.autoWidth = $false
     }
 
     $Options = $Options | ConvertTo-Json -Depth 6