From a93df3970e411a5bc1a7c0a994c553768e073239 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 8 May 2014 11:59:59 +0900
Subject: [PATCH] =?UTF-8?q?fix=20beta-issue=20#648=20=EC=9C=84=EC=A0=AF=20?=
 =?UTF-8?q?=EB=B0=95=EC=8A=A4=20border,=20background-color=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/widget/tpl/js/widget.js      | 20 ++++++++++++--------
 modules/widget/tpl/widget_layer.html | 10 +++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 212893f9c..ae0296545 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -664,16 +664,20 @@ function doShowWidgetSizeSetup(px, py, obj) {
 
 	jQuery.each(opts, function(key, val){
 		var el = form[0].elements[key];
-		if (el)
-		{
-			el.value = val;
-			if(el.className.match(/\bcolor-indicator\b/))
-			{
-				el.style.background = el.value = '#'+el.value;
+		var $el = jQuery(el);
+		if(el) {
+			$el.val(val);
+
+			if($el.hasClass('color-indicator')) {
+				if(val != 'transparent') {
+					val = val.toUpperCase();
+					$el.css('background', '#' + val);
+					$el.val('#' + val);
+				}
 			}
 		}
-		if (el.tagName.toLowerCase() == "select")
-		{
+
+		if(el.tagName.toLowerCase() == "select") {
 			if(el.selectedIndex == -1) {
 				el.selectedIndex = 0;
 			}
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 9afbdd1be..71c869df4 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -62,7 +62,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_top_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -72,7 +72,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_left_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 					<td style="text-align:right">
 						<input type="number" name="border_right_thick" value="" class="small_input" /> px
@@ -80,7 +80,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_right_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -90,7 +90,7 @@
 							<option value="solid">{$lang->cmd_widget_border_solid}</option>
 							<option value="dotted">{$lang->cmd_widget_border_dotted}</option>
 						</select>
-						<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="6"/>
+						<input type="text" name="border_bottom_color" value="" class="color_input color-indicator" maxlength="7"/>
 					</td>
 				</tr>
 				<tr>
@@ -126,7 +126,7 @@
 	<style scoped>
 	.wgs{margin:0;width:700px}
 	.wgs select{margin:0;width:auto}
-	.wgs input{margin:0!important;width:50px}
+	.wgs input{margin:0!important;width:60px}
 	</style>
 </section>
 <!--%load_js_plugin("ui.colorpicker")-->