WIP installer refactor, updates to color picker dependency type
[TFS Changeset #78360]
This commit is contained in:
@@ -14,6 +14,13 @@ namespace umbraco.cms.businesslogic.skinning.controls
|
||||
[ClientDependency(200,ClientDependencyType.Css, "colorpicker/css/colorpicker.css", "UmbracoClient")]
|
||||
public class ColorPicker: TextBox
|
||||
{
|
||||
|
||||
|
||||
protected override void Render(HtmlTextWriter writer)
|
||||
{
|
||||
this.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
|
||||
this.CssClass = "skinningcolorpicker";
|
||||
|
||||
base.Render(writer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -26,9 +26,7 @@ namespace umbraco.cms.businesslogic.skinning.dependencies
|
||||
public override WebControl Editor
|
||||
{
|
||||
get
|
||||
{
|
||||
cp.TextMode = System.Web.UI.WebControls.TextBoxMode.SingleLine;
|
||||
cp.CssClass = "color";
|
||||
{
|
||||
|
||||
if (_value.Count > 0 && !string.IsNullOrEmpty(_value[0].ToString()))
|
||||
cp.Text = _value[0].ToString();
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
var activecolorpicker;
|
||||
|
||||
jQuery('input.color').ColorPicker({
|
||||
jQuery('input.skinningcolorpicker').ColorPicker({
|
||||
onSubmit: function (hsb, hex, rgb, el) {
|
||||
jQuery(el).val('#' + hex);
|
||||
jQuery(el).ColorPickerHide();
|
||||
|
||||
Reference in New Issue
Block a user