From 40a698b9e8c3ab0ce9e1a5be2a52912c655fd7c1 Mon Sep 17 00:00:00 2001
From: "hjnim.kim" <hjnim.kim@samsung.com>
Date: Fri, 28 Dec 2012 15:07:20 +0900
Subject: [PATCH] Button: data-corners attribute has been added

JQM data-corners value has been changed from true to false
and applied data-corners attribute

Change-Id: Ibc543663c5495c65141449a3a3e300903e718327
---
 demos/tizen-winsets/widgets/button/button.html     |  8 ++++
 src/themes/tizen/common/jquery.mobile.button.less  |  4 +-
 src/themes/tizen/common/jquery.mobile.theme.less   | 46 +++++++++++++---------
 .../common/js/jquery.mobile.tizen.configure.js     |  3 +-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/demos/tizen-winsets/widgets/button/button.html b/demos/tizen-winsets/widgets/button/button.html
index dfb9cb4..9a3f0f3 100755
--- a/demos/tizen-winsets/widgets/button/button.html
+++ b/demos/tizen-winsets/widgets/button/button.html
@@ -54,6 +54,14 @@
 			<li class="ui-li-1line-btn2">List item<div  data-role="button" data-inline="true" data-icon="star" data-style="box"></div></li>
 			<li class="ui-li-1line-btn2">List item<div  data-role="button" data-inline="true" data-icon="scrolltop" data-style="box"></div></li>
 			<li class="ui-li-1line-btn2">List item<div  data-role="button" data-inline="true" data-icon="scrollleft" data-style="box"></div></li>
+			<li data-role="list-divider">Round Button Test</li>
+			<li class="ui-li-1line-btn2">Data Corners - false, style - circle<div data-role="button" data-inline="true" data-icon="minus" data-corners="false" data-style="circle"></div></li>
+			<li class="ui-li-1line-btn2">Data Corners - true, style - round<div data-role="button" data-inline="true" data-icon="minus" data-corners="false" data-style="round"></div></li>
+			<li class="ui-li-1line-btn2">Data Corners - false, style - box<div data-role="button" data-inline="true" data-icon="minus" data-corners="false" data-style="box"></div></li>
+			<li class="ui-li-1line-btn2">Data Corners - true, style - box<div data-role="button" data-inline="true" data-icon="minus" data-corners="true" data-style="box"></div></li>
+			<li class="ui-li-1line-btn1">Data Corners - false, style - round<div data-role="button" data-inline="true" data-icon="call" data-corners="false" data-style="round" data-iconpos="right">Icon Text</div></li>
+			<li class="ui-li-1line-btn1">Data Corners - true, style - box<div data-role="button" data-inline="true" data-icon="call" data-corners="true" data-style="box" data-iconpos="right">Icon Text</div></li>
+			<li class="ui-li-1line-btn1">Data Corners - false, style - box<div data-role="button" data-inline="true" data-icon="call" data-corners="false" data-style="box" data-iconpos="right">Icon Text</div></li>
 			<li data-role="list-divider">custom buttons</li>
 			<li><a href="buttonNolist.html">Buttons Pages(not in list) </a></li>
 		</ul>
diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less
index 7b0def3..7d40f02 100755
--- a/src/themes/tizen/common/jquery.mobile.button.less
+++ b/src/themes/tizen/common/jquery.mobile.button.less
@@ -257,11 +257,11 @@
 
 .ui-btn.ui-btn-corner-all
 {
-	.LESSborder-radius-all(0.3em);
+	.LESSborder-radius-allimportant(1.2em);
 }
 	
 /* No BG button : data-iconbg = "nobg" */
-.ui-btn.ui-btn-corner-all.ui-btn-icon-nobg
+.ui-btn.ui-btn-icon-nobg
 {
 	box-shadow: none;
 }
diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less
index 38a7dcb..5951aa3 100755
--- a/src/themes/tizen/common/jquery.mobile.theme.less
+++ b/src/themes/tizen/common/jquery.mobile.theme.less
@@ -300,10 +300,27 @@
 }
 .ui-btn-box-s.ui-btn-up-s {
 	.LESSbutton_box_style;
-        .LESSborder-radius-all( 0.3rem );
+	.LESSborder-radius-all( 0.3rem );
 	.LESSbutton_text1_style;
 }
 
+.ui-btn.ui-btn-corner-all .ui-btn-box-s.ui-btn-up-s {
+	.LESSborder-radius-all( 1.2rem );
+}
+
+.ui-btn-box-s .ui-btn-inner {
+	border: 1px solid;
+	border-color: rgb(199, 197, 190);
+	.LESSborder-radius-all( 0.3rem );
+	.LESSbox-boxsizing( border-box );
+	.LESSbutton_inner_box_style;
+	height: 100%;
+}
+
+.ui-btn.ui-btn-corner-all.ui-btn-box-s .ui-btn-inner {
+	.LESSborder-radius-all( 1.2rem );
+}
+
 .ui-ctxpopup .ui-btn-box-s{
 	&.ui-btn-up-s,
 	&.ui-btn-hover-s {
@@ -332,15 +349,6 @@
         background: @color_ctxbutton_press !important;
 }
 
-.ui-btn-box-s .ui-btn-inner {
-	border: 1px solid;
-	border-color: rgb(199, 197, 190);
-	.LESSborder-radius-all( 0.3rem );
-	.LESSbox-boxsizing( border-box );
-	.LESSbutton_inner_box_style;
-	height: 100%;
-}
-
 .ui-header .ui-btn-box-s,
 .ui-footer .ui-btn-box-s,
 .ui-btn-back.ui-btn-up-s,
@@ -354,12 +362,17 @@
 .ui-btn-box-s.ui-btn-hover-s {
 	.LESSbutton_hover_style;
 	.LESSbutton_text1_style;
+	.LESSborder-radius-allimportant( 0.3em );
 }
-/*
-.ui-btn-box-s.ui-btn-hover-s.ui-btn-corner-circle{
-	.LESScirclebutton_hover_style;
+.ui-btn-box-s.ui-btn-hover-s.ui-btn-corner-circle {
+	.LESSborder-radius-allimportant( 1em );
+}
+.ui-btn-box-s.ui-btn-hover-s.ui-btn-corner-all {
+	.LESSborder-radius-allimportant( 1.2em );
+}
+.ui-btn-box-s.ui-btn-hover-s.ui-btn-round {
+	.LESSborder-radius-allimportant( 1.2em );
 }
-*/
 .ui-btn-box-s.ui-btn-down-s .ui-btn-inner {
 	.LESSbutton_down_style;
 }
@@ -370,11 +383,8 @@
 	font-family: Helvetica, Arial, sans-serif;
 	text-decoration: none;
 }
-/*
-.ui-btn-down-s.ui-btn-corner-circle{
-	.LESScirclebutton_press_style;
-}
 
+/*
 /* Structure */
 /* links within "buttons" 
 -----------------------------------------------------------------------------------------------------------*/
diff --git a/src/widgets/common/js/jquery.mobile.tizen.configure.js b/src/widgets/common/js/jquery.mobile.tizen.configure.js
index 33a45c7..8d0da50 100644
--- a/src/widgets/common/js/jquery.mobile.tizen.configure.js
+++ b/src/widgets/common/js/jquery.mobile.tizen.configure.js
@@ -7,5 +7,6 @@
 	/* depth transition */
 	$.mobile.transitionHandlers.depth = $.mobile.transitionHandlers.simultaneous;
 	$.mobile.transitionFallbacks.depth = "fade";
-
+	/* Button data-corners default value */
+	$.fn.buttonMarkup.defaults.corners = false;
 })( jQuery, this );
-- 
2.7.4