diff --git a/src/Umbraco.Web/PropertyEditors/SliderConfiguration.cs b/src/Umbraco.Core/PropertyEditors/SliderConfiguration.cs similarity index 93% rename from src/Umbraco.Web/PropertyEditors/SliderConfiguration.cs rename to src/Umbraco.Core/PropertyEditors/SliderConfiguration.cs index f91da8e68d..b2bf99bdc6 100644 --- a/src/Umbraco.Web/PropertyEditors/SliderConfiguration.cs +++ b/src/Umbraco.Core/PropertyEditors/SliderConfiguration.cs @@ -1,6 +1,4 @@ -using Umbraco.Core.PropertyEditors; - -namespace Umbraco.Web.PropertyEditors +namespace Umbraco.Core.PropertyEditors { /// /// Represents the configuration for the slider value editor. @@ -8,7 +6,7 @@ namespace Umbraco.Web.PropertyEditors public class SliderConfiguration { [ConfigurationField("enableRange", "Enable range", "boolean")] - public string Range { get; set; } + public bool EnableRange { get; set; } [ConfigurationField("orientation", "Orientation", "views/propertyeditors/slider/orientation.prevalues.html")] public string Orientation { get; set; } @@ -38,7 +36,7 @@ namespace Umbraco.Web.PropertyEditors public string Tooltip { get; set; } [ConfigurationField("tooltipSplit", "Tooltip split", "boolean", Description = "If false show one tootip if true show two tooltips one for each handler")] - public string TooltipSplit { get; set; } // fixme bool? + public bool TooltipSplit { get; set; } // fixme bool? [ConfigurationField("tooltipFormat", "Tooltip format", "textstring", Description = "The value wanted to be displayed in the tooltip. Use {0} and {1} for current values - {1} is only for range slider and if not using tooltip split.")] public string TooltipFormat { get; set; } @@ -47,7 +45,7 @@ namespace Umbraco.Web.PropertyEditors public string TooltipPosition { get; set; } [ConfigurationField("reversed", "Reversed", "boolean", Description = "Whether or not the slider should be reversed")] - public string Reversed { get; set; } // fixme bool? + public bool Reversed { get; set; } // fixme bool? [ConfigurationField("ticks", "Ticks", "textstring", Description = "Comma-separated values. Used to define the values of ticks. Tick marks are indicators to denote special values in the range. This option overwrites min and max options.")] public string Ticks { get; set; } @@ -61,4 +59,4 @@ namespace Umbraco.Web.PropertyEditors [ConfigurationField("ticksSnapBounds", "Ticks snap bounds", "number", Description = "Used to define the snap bounds of a tick. Snaps to the tick if value is within these bounds.")] public int TicksSnapBounds { get; set; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Core/PropertyEditors/SliderPropertyEditorConfiguration.cs b/src/Umbraco.Core/PropertyEditors/SliderPropertyEditorConfiguration.cs deleted file mode 100644 index 974f9bfab0..0000000000 --- a/src/Umbraco.Core/PropertyEditors/SliderPropertyEditorConfiguration.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Newtonsoft.Json; - -namespace Umbraco.Core.PropertyEditors -{ - public class SliderPropertyEditorConfiguration - { - [JsonProperty("enableRange")] - public bool EnableRange { get; set; } - } -} diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs index 8e79e2273c..a43d391dbe 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/SliderValueConverter.cs @@ -72,7 +72,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters return Storages.GetOrAdd(dataTypeId, id => { var dataType = _dataTypeService.GetDataType(id); - var configuration = dataType.ConfigurationAs(); + var configuration = dataType.ConfigurationAs(); return configuration.EnableRange; }); } diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 456b647a7a..e217dd87d5 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -404,7 +404,7 @@ - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index e8bbf256b8..fe1c326a46 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -335,7 +335,6 @@ -