Merge pull request #938 from ironmansoftware/934-2

Fixes #935 #934
ironmansoftware · Jul 3, 2019 · 7ae6a93 · 7ae6a93
2 parents 3a1c724 + 8f7952e
commit 7ae6a93
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/UniversalDashboard.Materialize/Components/ud-fab.jsx b/src/UniversalDashboard.Materialize/Components/ud-fab.jsx
@@ -31,8 +31,14 @@ export default class UDFab extends React.Component {
             icon = <UdIcon icon={this.props.icon}/>
         }
 
-        var children = this.props.content.map(x => <UDFabButton {...x} />);
-
+        var content = this.props.content;
+
+        if (!Array.isArray(content)) {
+            content = [content]
+        }
+
+        var children = content.map(x => <UDFabButton {...x} />);
+
         return <Button 
                     floating
                     fab={{direction: this.props.expandDirection}}

diff --git a/src/UniversalDashboard.UITest/Manifest.Tests.ps1 b/src/UniversalDashboard.UITest/Manifest.Tests.ps1
@@ -11,7 +11,7 @@ Get-UDDashboard | Stop-UDDashboard
 Describe "Manifest" {
 
     It "should have correct version" {
-        (Get-Module 'UniversalDashboard.Community').Version | Should be "2.5.1"
+        (Get-Module 'UniversalDashboard.Community').Version | Should be "2.5.2"
     }
 
     It "should have correct exported commands" {

diff --git a/src/UniversalDashboard/New-UDModuleManifest.ps1 b/src/UniversalDashboard/New-UDModuleManifest.ps1
@@ -5,7 +5,7 @@ param(
 
 Remove-Item  (Join-Path $outputDirectory 'UniversalDashboard.Community.psd1') -ErrorAction SilentlyContinue -Force
 
-$version = "2.5.1"
+$version = "2.5.2"
 #$prerelease = "-beta2"
 
 $ReleaseNotes = "

diff --git a/src/UniversalDashboard/Server/DashboardHub.cs b/src/UniversalDashboard/Server/DashboardHub.cs
@@ -14,6 +14,7 @@
 using UniversalDashboard.Services;
 using System.Text;
 using UniversalDashboard.Models.Enums;
+using Microsoft.CSharp.RuntimeBinder;
 
 namespace UniversalDashboard
 {
@@ -242,6 +243,9 @@ public Task ClientEvent(string eventId, string eventName, string eventData, stri
                             Clients.Client(Context.ConnectionId).SendAsync("showError", new { message = error.Message });
                         }
 
+                    }
+                    catch (RuntimeBinderException) {
+
                     }
                     catch (Exception ex)
                     {

diff --git a/src/poshud/utils.ps1 b/src/poshud/utils.ps1
@@ -3,7 +3,7 @@ function New-UDComponentPage {
         $Command
     )
 
-    New-UDPage -Name $Command -Endpoint {
+    New-UDPage -Name $Command -Content {
 
         $Help = Get-Help $Command -Full
         $OnlineVersion = $Help.relatedLinks.navigationLink | Where-Object linkText -eq 'Online Version:' | Select-Object -ExpandProperty uri