property-value-converter functional

Hendy · Jun 18, 2018 · 69384c4 · 69384c4
1 parent 4c5ac4e
commit 69384c4
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/src/Our.Umbraco.NullableTypes/Converters/NullableIntegerPropertyValueConverter.cs b/src/Our.Umbraco.NullableTypes/Converters/NullableIntegerPropertyValueConverter.cs
@@ -1,4 +1,5 @@
-using Our.Umbraco.NullableTypes.PropertyEditors;
+using Newtonsoft.Json.Linq;
+using Our.Umbraco.NullableTypes.PropertyEditors;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 
@@ -31,6 +32,43 @@ public override object ConvertSourceToObject(PublishedPropertyType publishedProp
 
             if (source != null)
             {
+                if (source is int)
+                {
+                    nullableInteger = (int)source;
+                }
+                else if (source is string)
+                {
+                    var sourceString = source.ToString();
+
+                    if (int.TryParse(sourceString, out int sourceStringParsed))
+                    {
+                        nullableInteger = sourceStringParsed;
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var value = JObject.Parse(sourceString);
+
+                            if (value.Type == JTokenType.Object)
+                            {
+                                var checkbox = (bool)value["checkbox"];
+                                var number = (string)value["number"];
+
+                                if (checkbox)
+                                {
+                                    if (int.TryParse(number, out int numberParsed))
+                                    {
+                                        nullableInteger = numberParsed;
+                                    }
+                                }
+                            }
+                        }
+                        catch
+                        {
+                        }
+                    }
+                }
             }
 
             return nullableInteger;

diff --git a/src/Our.Umbraco.NullableTypes/Resources/NullableInteger.html b/src/Our.Umbraco.NullableTypes/Resources/NullableInteger.html
@@ -5,13 +5,13 @@
            ng-change="checkboxChange()"/>
 
     <input type="number" 
-           pattern="[0-9]*"
            min="{{model.config.minimumValue}}"
            max="{{model.config.maximumValue}}"
            step="{{model.config.stepSize}}"
-           class=""
+           pattern="/^-?[0-9][^\.]*$/"
+           class="umb-number"
            ng-model="model.number" 
            ng-disabled="!(model.value.checkbox)"
-           fix-number />
+           ng-required="model.value.checkbox"/>
 
 </div>