Fixes #258

ironmansoftware · May 18, 2019 · 55af5f5 · 55af5f5
1 parent 8df3e56
commit 55af5f5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/UniversalDashboard.Materialize/Components/custom-cell.jsx b/src/UniversalDashboard.Materialize/Components/custom-cell.jsx
@@ -6,21 +6,28 @@ export default class CustomCell extends React.Component {
         const validComponents = ["link", "icon", "image", "element"]
 
         var y = this.props.value;
+        var moment2 = moment(y);
 
         if (y == null) {
             return <span></span>;
         }        
         if (y.DateTime) {
-            var moment2 = moment(y.value);
+            moment2 = moment(y.value);
             if (moment2.isValid) {
                 return <span>{moment2.format(this.props.dateTimeFormat)}</span>;
             }
             else {
                 return <span>{y.DateTime}</span>;
             }
         }
+        else if (moment2.isValid) {
+
+            if (moment2.isValid) {
+                return <span>{moment2.format(this.props.dateTimeFormat)}</span>;
+            }
+        }
         else if (y.startsWith && y.startsWith("/Date(")){
-            var moment2 = moment(y.substr(6), 'x)/"');
+            moment2 = moment(y.substr(6), 'x)/"');
             if (moment2.isValid) {
                 return <span>{moment2.format(this.props.dateTimeFormat)}</span>;
             }