Fixing issue with scoping.

ironmansoftware · May 19, 2020 · 220d726 · 220d726
1 parent e2df8f5
commit 220d726
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/v2/Scripts/grid.ps1 b/src/v2/Scripts/grid.ps1
@@ -31,7 +31,7 @@ function New-UDGrid {
         [Parameter()]
         [Switch]$NoFilter,
         [Parameter(Mandatory)]
-        [object]$Endpoint,
+        [Endpoint]$Endpoint,
         [Parameter()]
         [object[]]$ArgumentList,
         [Parameter()]
@@ -44,14 +44,7 @@ function New-UDGrid {
 
     End {
 
-        if ($null -ne $Endpoint) {
-            if ($Endpoint -is [scriptblock]) {
-                $Endpoint = New-UDEndpoint -Endpoint $Endpoint -Id $Id -ArgumentList $ArgumentList
-            }
-            elseif ($Endpoint -isnot [UniversalDashboard.Models.Endpoint]) {
-                throw "Endpoint must be a script block or UDEndpoint"
-            }
-        }
+        $Endpoint.Register($Id, $PSCmdlet)
 
         @{
             type = 'ud-grid'

diff --git a/src/v2/Scripts/page.ps1 b/src/v2/Scripts/page.ps1
@@ -33,7 +33,7 @@ function New-UDPage
     }
 
     [array]$c = @()
-    if ($Content) { [array]$c = & $Content}
+    if ($Content) { [array]$c = . $Content}
 
     @{
         name = $Name