Fixes Slider

This commit is contained in:
Shannon
2018-08-22 14:13:33 +10:00
parent 3b4e5ad8c9
commit c164a4789b
5 changed files with 7 additions and 20 deletions

View File

@@ -1,6 +1,4 @@
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors
namespace Umbraco.Core.PropertyEditors
{
/// <summary>
/// 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; }
}
}
}

View File

@@ -1,10 +0,0 @@
using Newtonsoft.Json;
namespace Umbraco.Core.PropertyEditors
{
public class SliderPropertyEditorConfiguration
{
[JsonProperty("enableRange")]
public bool EnableRange { get; set; }
}
}

View File

@@ -72,7 +72,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
return Storages.GetOrAdd(dataTypeId, id =>
{
var dataType = _dataTypeService.GetDataType(id);
var configuration = dataType.ConfigurationAs<SliderPropertyEditorConfiguration>();
var configuration = dataType.ConfigurationAs<SliderConfiguration>();
return configuration.EnableRange;
});
}

View File

@@ -404,7 +404,7 @@
<Compile Include="PropertyEditors\PropertyEditorCollection.cs" />
<Compile Include="PropertyEditors\PropertyEditorTagsExtensions.cs" />
<Compile Include="PropertyEditors\PropertyValueLevel.cs" />
<Compile Include="PropertyEditors\SliderPropertyEditorConfiguration.cs" />
<Compile Include="PropertyEditors\SliderConfiguration.cs" />
<Compile Include="PropertyEditors\TagConfiguration.cs" />
<Compile Include="PropertyEditors\ValueConverters\ImageCropperValue.cs" />
<Compile Include="PropertyEditors\ValueConverters\ImageCropperValueTypeConverter.cs" />

View File

@@ -335,7 +335,6 @@
<Compile Include="PropertyEditors\RelatedLinksConfiguration.cs" />
<Compile Include="PropertyEditors\RelatedLinksConfigurationEditor.cs" />
<Compile Include="PropertyEditors\RichTextConfiguration.cs" />
<Compile Include="PropertyEditors\SliderConfiguration.cs" />
<Compile Include="PropertyEditors\SliderConfigurationEditor.cs" />
<Compile Include="PropertyEditors\TagConfigurationEditor.cs" />
<Compile Include="PropertyEditors\TextAreaConfiguration.cs" />