Add compact db demo, add THtmlArea::EnableCompression, add ClientSide options for TColorPicker

2 files changed, 10 insertions, 17 deletions

diff --git a/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
index 746a0caf..557b4b51 100644
--- a/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
+++ b/framework/Web/Javascripts/source/prado/colorpicker/colorpicker.js
@@ -461,6 +461,8 @@ Object.extend(Prado.WebUI.TColorPicker.prototype,
 		this.button.style.backgroundColor = color.toString();

 		if(typeof(this.onChange) == "function")

 			this.onChange(color);

+		if(this.options.OnColorSelected)

+			this.options.OnColorSelected(this,color);

 	},

 

 	getFullPickerContainer : function(pickerID)

diff --git a/framework/Web/Javascripts/source/prado/colorpicker/default.css b/framework/Web/Javascripts/source/prado/colorpicker/default.css
index 67235c08..7bbc08d5 100644
--- a/framework/Web/Javascripts/source/prado/colorpicker/default.css
+++ b/framework/Web/Javascripts/source/prado/colorpicker/default.css
@@ -3,8 +3,6 @@
 

 .TColorPicker_button

 {

-	border: 1px solid #919EA9;

-	background-color: #fff;

 }

 

 .TColorPicker

@@ -49,23 +47,16 @@
 }

 

 /** UI **/

-.TColorPicker_button

-{

-	position: absolute;	

-	font-size: 0;

-	padding: 1px;

-	margin-left: 1px;

-}

-

 .TColorPicker_button img

 {

-	width: 18px; 

-	height: 18px;

-}

-

-* html .TColorPicker_button

-{

-	margin-top: 1px;

+	border: 2px ridge ActiveBorder;

+	background-color: #fff;

+	padding: 1px;

+	height: 16px;

+	width: 16px;

+	margin: 1px;

+	margin-bottom: -6px;

+	margin-bottom: expression(-4); /** IE hack **/

 }

 

 .TColorPicker