From 0cd73c327304cf670f9ec69a2df23419a596e7c9 Mon Sep 17 00:00:00 2001
From: starfighter83 <unknown@kiln.example.com>
Date: Thu, 25 Nov 2010 09:59:42 +0000
Subject: [PATCH] updates color picker datatype so it supports updates to key
 value prevalue editor

[TFS Changeset #80615]
---
 .../colorpicker/ColorPickerDataType.cs        |  2 +-
 .../editorControls/colorpicker/colorPicker.cs | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/components/editorControls/colorpicker/ColorPickerDataType.cs b/components/editorControls/colorpicker/ColorPickerDataType.cs
index 608e75b945..56115aec36 100644
--- a/components/editorControls/colorpicker/ColorPickerDataType.cs
+++ b/components/editorControls/colorpicker/ColorPickerDataType.cs
@@ -17,7 +17,7 @@ namespace umbraco.editorControls.colorpicker
 			{
 				if (_Editor == null) 
 				{
-					_Editor = new colorPicker(Data,((KeyValuePrevalueEditor)PrevalueEditor).Prevalues);
+					_Editor = new colorPicker(Data,((KeyValuePrevalueEditor)PrevalueEditor).PrevaluesAsKeyValuePairList);
 				}
 				return _Editor;
 			}
diff --git a/components/editorControls/colorpicker/colorPicker.cs b/components/editorControls/colorpicker/colorPicker.cs
index 725ddf39e8..c8a0626917 100644
--- a/components/editorControls/colorpicker/colorPicker.cs
+++ b/components/editorControls/colorpicker/colorPicker.cs
@@ -4,6 +4,7 @@ using System.Web.UI.WebControls;
 using System.ComponentModel;
 using System.Collections;
 using umbraco.IO;
+using System.Collections.Generic;
 
 namespace umbraco.editorControls
 {
@@ -23,6 +24,14 @@ namespace umbraco.editorControls
             _data = Data;
             _prevalues = Prevalues;
         }
+
+        List<KeyValuePair<int, String>> Prevalues;
+        public colorPicker(interfaces.IData Data, List<KeyValuePair<int, String>> Prevalues)
+        {
+            _data = Data;
+            this.Prevalues = Prevalues;
+        }
+
         private ArrayList _colors = new ArrayList();
 
         public Control Editor { get { return this; } }
@@ -56,9 +65,19 @@ namespace umbraco.editorControls
 
             try
             {
-                foreach (string val in _prevalues.Values)
+                if (_prevalues != null)
                 {
-                    _colors.Add(new ListItem(val));
+                    foreach (string val in _prevalues.Values)
+                    {
+                        _colors.Add(new ListItem(val));
+                    }
+                }
+                else if (Prevalues != null)
+                {
+                    foreach (KeyValuePair<int, String> item in Prevalues)
+                    {
+                        _colors.Add(new ListItem(item.Value));
+                    }
                 }
             }
             catch { }