From 56fee292c37e162c03fab9eeadd6a8b9ab85c251 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 4 Sep 2006 19:15:47 +0000
Subject: merge from 3.0 branch till 1387

---
 framework/Web/UI/WebControls/TColorPicker.php | 34 ++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

(limited to 'framework/Web/UI/WebControls/TColorPicker.php')

diff --git a/framework/Web/UI/WebControls/TColorPicker.php b/framework/Web/UI/WebControls/TColorPicker.php
index 7b40f033..a1284b5e 100644
--- a/framework/Web/UI/WebControls/TColorPicker.php
+++ b/framework/Web/UI/WebControls/TColorPicker.php
@@ -40,19 +40,19 @@ class TColorPicker extends TTextBox
 	}
 
 	/**
-	 * @param string color picker UI mode, "Simple", "Basic" or "Full", default is "Basic"
+	 * @param TColorPickerMode color picker UI mode
 	 */
 	public function setMode($value)
 	{
-	   $this->setViewState('Mode', TPropertyValue::ensureEnum($value, 'Simple', 'Basic', 'Full'), 'Basic');
+	   $this->setViewState('Mode', TPropertyValue::ensureEnum($value, 'TColorPickerMode'), TColorPickerMode::Basic);
 	}
 
 	/**
-	 * @return string current color picker UI mode.
+	 * @return TColorPickerMode current color picker UI mode. Defaults to TColorPickerMode::Basic.
 	 */
 	public function getMode()
 	{
-	   return $this->getViewState('Mode', 'Basic');
+	   return $this->getViewState('Mode', TColorPickerMode::Basic);
 	}
 
 	/**
@@ -117,8 +117,8 @@ class TColorPicker extends TTextBox
 		{
 			$mode = $this->getMode();
 
-			if($mode == 'Full') $options['Mode'] = $mode;
-			else if($mode == 'Simple') $options['Palette'] = 'Tiny';
+			if($mode == TColorPickerMode::Full) $options['Mode'] = $mode;
+			else if($mode == TColorPickerMode::Simple) $options['Palette'] = 'Tiny';
 
 			$options['OKButtonText'] = $this->getOKButtonText();
 			$options['CancelButtonText'] = $this->getCancelButtonText();
@@ -242,4 +242,26 @@ class TColorPicker extends TTextBox
 	}
 }
 
+/**
+ * TColorPickerMode class.
+ * TColorPickerMode defines the enumerable type for the possible UI mode
+ * that a {@link TColorPicker} control can take.
+ *
+ * The following enumerable values are defined:
+ * - Simple
+ * - Basic
+ * - Full
+ *
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @version $Revision: $  $Date: $
+ * @package System.Web.UI.WebControls
+ * @since 3.0.4
+ */
+class TColorPickerMode extends TEnumerable
+{
+	const Simple='Simple';
+	const Basic='Basic';
+	const Full='Full';
+}
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3