summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoumin Ha <youmin.ha@samsung.com>2012-08-28 20:05:50 +0900
committerYoumin Ha <youmin.ha@samsung.com>2012-08-28 20:05:50 +0900
commit21732f13df48f188a9aae7ec0f32ad114ee13bf4 (patch)
tree37b64e91908ff98cbde02c327738786057da7948
parentbe6beebae0ff9beefd2c43cfd5ee10419b4cda55 (diff)
downloadweb-ui-fw-21732f13df48f188a9aae7ec0f32ad114ee13bf4.tar.gz
web-ui-fw-21732f13df48f188a9aae7ec0f32ad114ee13bf4.tar.bz2
web-ui-fw-21732f13df48f188a9aae7ec0f32ad114ee13bf4.zip
Export 0.1.42
-rwxr-xr-xdemos/tizen-winsets/widgets/grid/css/namecard.css8
-rwxr-xr-xdemos/tizen-winsets/widgets/list/list-swipe.html52
-rw-r--r--packaging/web-ui-fw.spec16
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.controlgroup.less12
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.listview.less2
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.theme.less2
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less4
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less12
-rw-r--r--src/themes/tizen/common/jquery.mobile.tizen.notification.less6
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.tizen.optionheader.less2
-rwxr-xr-x[-rw-r--r--]src/themes/tizen/common/jquery.mobile.tizen.swipelist.less22
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.tizen.triangle.less2
-rwxr-xr-xsrc/themes/tizen/common/jquery.mobile.tizen.virtualgridview.less2
-rwxr-xr-xsrc/themes/tizen/tizen-black/images/ajax-loader.pngbin0 -> 503 bytes
-rwxr-xr-xsrc/themes/tizen/tizen-black/style.less118
-rwxr-xr-xsrc/themes/tizen/tizen-white/images/ajax-loader.pngbin0 -> 503 bytes
-rwxr-xr-xsrc/themes/tizen/tizen-white/style.less28
-rw-r--r--src/widgets/common/js/jquery.mobile.tizen.scrollview.js8
-rw-r--r--src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js8
-rwxr-xr-xsrc/widgets/multimediaview/js/jquery.mobile.tizen.multimediaview.js14
-rw-r--r--src/widgets/notification/js/jquery.mobile.tizen.notification.js14
-rwxr-xr-xsrc/widgets/optionheader/js/jquery.mobile.tizen.optionheader.js33
-rwxr-xr-xsrc/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js4
-rwxr-xr-xsrc/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js4
24 files changed, 205 insertions, 168 deletions
diff --git a/demos/tizen-winsets/widgets/grid/css/namecard.css b/demos/tizen-winsets/widgets/grid/css/namecard.css
index 105edea7..0ef9d052 100755
--- a/demos/tizen-winsets/widgets/grid/css/namecard.css
+++ b/demos/tizen-winsets/widgets/grid/css/namecard.css
@@ -56,7 +56,7 @@
}
.ui-demo-namecard-span-x {
- color : white;
+ color : gray;
font : normal 0.8rem Georgia, serif !important;
width: 5rem;
@@ -69,7 +69,7 @@
}
.ui-demo-namecard-contents span.name {
- color : white;
+ color : gray;
font : normal 0.8rem Georgia, serif !important;
width: 5rem;
@@ -111,8 +111,8 @@
left : 9.6rem;
font-weight : normal;
font-size : 1.2rem;
- color : white;
+ color : gray;
padding-top : 1rem;
font-family: Helvetica, Arial, sans-serif;
margin-top: 0rem;
-} \ No newline at end of file
+}
diff --git a/demos/tizen-winsets/widgets/list/list-swipe.html b/demos/tizen-winsets/widgets/list/list-swipe.html
index bb4adba3..22b8a06b 100755
--- a/demos/tizen-winsets/widgets/list/list-swipe.html
+++ b/demos/tizen-winsets/widgets/list/list-swipe.html
@@ -5,99 +5,99 @@
<div class="content" data-role="content">
<ul data-role="listview">
<ul data-role="swipelist">
- <li class="ui-li-1line-leftsub1 ui-li-dialogue">
+ <li class="ui-li-multiline ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div style="display: inline-block;" class="ui-li-text-sub-left">subtext</div>
- <div style="display: inline-block;" class="ui-li-text-main-right">1line-leftsub1</div>
+ 1line-leftsub1
+ <div class="ui-li-text-sub">subtext</div>
</div>
</li>
- <li class="ui-li-1line ui-li-dialogue">
+ <li class="ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
- <div data-role="swipelist-item-cover">1line
-<!-- <div class="ui-li-text-main">1line</div>-->
+ <div data-role="swipelist-item-cover">
+ 1line
</div>
</li>
- <li class="ui-li-1line-leftsub1 ui-li-dialogue">
+ <li class="ui-li-multiline ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div style="display: inline-block;" class="ui-li-text-sub-left">subtext</div>
- <div style="display: inline-block;" class="ui-li-text-main-right">1line-leftsub1</div>
+ 1line-leftsub1
+ <div class="ui-li-text-sub">subtext</div>
</div>
</li>
- <li class="ui-li-1line ui-li-dialogue">
+ <li class="ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div class="ui-li-text-main">1line</div>
+ 1line
</div>
</li>
- <li class="ui-li-1line-leftsub1 ui-li-dialogue">
+ <li class="ui-li-multiline ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div style="display: inline-block;" class="ui-li-text-sub-left">subtext</div>
- <div style="display: inline-block;" class="ui-li-text-main-right">1line-leftsub1</div>
+ 1line-leftsub1
+ <div class="ui-li-text-sub">subtext</div>
</div>
</li>
- <li class="ui-li-1line ui-li-dialogue">
+ <li class="ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div class="ui-li-text-main">1line</div>
+ 1line
</div>
</li>
- <li class="ui-li-1line-leftsub1 ui-li-dialogue">
+ <li class="ui-li-multiline ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div style="display: inline-block;" class="ui-li-text-sub-left">subtext</div>
- <div style="display: inline-block;" class="ui-li-text-main-right">1line-leftsub1</div>
+ 1line-leftsub1
+ <div class="ui-li-text-sub">subtext</div>
</div>
</li>
- <li class="ui-li-1line ui-li-dialogue">
+ <li class="ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div class="ui-li-text-main">1line</div>
+ 1line
</div>
</li>
- <li class="ui-li-1line-leftsub1 ui-li-dialogue">
+ <li class="ui-li-multiline ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div style="display: inline-block;" class="ui-li-text-sub-left">subtext</div>
- <div style="display: inline-block;" class="ui-li-text-main-right">1line-leftsub1</div>
+ 1line-leftsub1
+ <div class="ui-li-text-sub">subtext</div>
</div>
</li>
- <li class="ui-li-1line ui-li-dialogue">
+ <li class="ui-li-dialogue">
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Twitter</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="button" data-inline="true">Facebook</div>
<div data-role="swipelist-item-cover">
- <div class="ui-li-text-main">1line</div>
+ 1line
</div>
</li>
</ul>
diff --git a/packaging/web-ui-fw.spec b/packaging/web-ui-fw.spec
index 0c92bc88..aad0036c 100644
--- a/packaging/web-ui-fw.spec
+++ b/packaging/web-ui-fw.spec
@@ -1,5 +1,5 @@
Name: web-ui-fw
-Version: 0.1.41
+Version: 0.1.42
Release: 0
Summary: Tizen Web UI Framework Library
Group: Development/Other
@@ -88,9 +88,21 @@ Summary: Tizen Web UI Framework Demo Application: tizen winset demo
###############################
%changelog
+* Tue Aug 28 2012 Minkyu Kang <mk7.kang@samsung.com> 0.1.42
+- FIX:
+ - multimediaview: video progress bar display normally for too samll
+ - segmentcontrol: remove media query
+ - scrollview: add outer scroll condition
+ - datetimepicker: modify triangle size
+ - popupwindow: set the screen height explicitly
+ - notification: add multiline text
+- Spec changes:
+ - mutibuttonentry: support new GUI
+ - virtualgrid: support new GUI
+
* Mon Aug 27 2012 Jinhyuk Jun <jinhyuk.jun@samsung.com> 0.1.41
- FIX:
- - radio/check button : button size bug fix
+ - radio/check button : button size bug fix
* Fri Aug 24 2012 Minkyu Kang <mk7.kang@samsung.com> 0.1.40
- FIX:
diff --git a/src/themes/tizen/common/jquery.mobile.controlgroup.less b/src/themes/tizen/common/jquery.mobile.controlgroup.less
index 53442591..b1e7dd3d 100755
--- a/src/themes/tizen/common/jquery.mobile.controlgroup.less
+++ b/src/themes/tizen/common/jquery.mobile.controlgroup.less
@@ -89,15 +89,3 @@ fieldset.ui-controlgroup {
margin-right: 0;
}
}
-
-@media all and (min-width: 450px){
- .ui-controlgroup-label {
- vertical-align: top;
- display: inline-block;
- width: 20%;
- margin: 0 2% 0 0;
- }
- .ui-controlgroup-controls {
- display: inline-block;
- }
-}
diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less
index 69ff2192..1a5380ed 100755
--- a/src/themes/tizen/common/jquery.mobile.listview.less
+++ b/src/themes/tizen/common/jquery.mobile.listview.less
@@ -336,7 +336,7 @@ li.ui-li-thumbnail-right {
border-left-width : 1px;
border-left-style : solid;
- border-left-color : rgba(42, 137, 194, 0.5);
+ border-left-color : @color_list_divider_expand_div;
}
diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less
index b62d8df4..48cae2b0 100755
--- a/src/themes/tizen/common/jquery.mobile.theme.less
+++ b/src/themes/tizen/common/jquery.mobile.theme.less
@@ -463,7 +463,7 @@
}
li.ui-btn-down-s {
background: none;
- background-color: @color_button_press;
+ background-color: @color_list_press;
color: @color_text;
}
/* listview: fonts for li with a link */
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less b/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less
index 8e7abac9..85cd031e 100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.datetimepicker.less
@@ -58,8 +58,8 @@
font-size: 44 * @unit_base;
float: left;
padding: 30 * @unit_base 8 * @unit_base 0 8 * @unit_base;
- max-width: 200 * @unit_base;
- min-width: 200 * @unit_base;
+ max-width: 120 * @unit_base;
+ min-width: 120 * @unit_base;
a.ui-link {
text-decoration: none;
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less b/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less
index 4d466faf..e737ffaa 100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.multibuttonentry.less
@@ -59,17 +59,17 @@ a.ui-multibuttonentry-link-base {
font-size : 1em;
font-weight : bold;
text-decoration : none;
- background-color : @color_multibuttonentry_bg;
+ border : solid 2px @color_multibuttonentry_link_bg;
}
a.ui-multibuttonentry-link {
- color : @color_multibuttonentry_link !important;
- border : solid 2px @color_multibuttonentry_link;
+ color : @color_multibuttonentry_link !important;
+ background-color : @color_multibuttonentry_link_bg;
}
a.ui-multibuttonentry-link-dim {
- color : @color_multibuttonentry_dim !important;
- border : solid 2px @color_multibuttonentry_dim;
+ color : @color_multibuttonentry_link_bg !important;
+ background-color : @color_multibuttonentry_bg;
}
div.ui-multibuttonentry-block {
@@ -95,4 +95,4 @@ div.ui-multibuttonentry-sblock {
.ui-multibuttonentry-focus-button {
background-image : url(./images/00_button_expand_opened.png);
- } \ No newline at end of file
+ }
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.notification.less b/src/themes/tizen/common/jquery.mobile.tizen.notification.less
index 74601886..9bb6496d 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.notification.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.notification.less
@@ -65,6 +65,7 @@
.ui-btn-inner {
padding: 0.3em 0.7em;
+ background: @color_ticker_btn;
}
}
@@ -116,7 +117,6 @@
@-webkit-keyframes ui-smallpopup-hide {
from {
opacity: 1;
- height: @smallpopup-height;
left: 0;
-webkit-transform: scaleY(1);
} to {
@@ -130,10 +130,8 @@
.ui-smallpopup {
position: fixed;
display: none;
- top: 0;
left: 0;
width: 100%;
- height: @smallpopup-height;
z-index: @z_base_smallpopup;
background: @color_smallpopup_bg;
vertical-align: middle;
@@ -159,6 +157,8 @@
.ui-smallpopup-text-bg {
position: relative;
margin-top: 6 * @unit_base;
+ margin-bottom: 6 * @unit_base;
margin-left: 16 * @unit_base;
+ margin-right: 16 * @unit_base;
color: @color_smallpopup_text;
}
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less b/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less
index 504da87e..74af122e 100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.optionheader.less
@@ -75,7 +75,7 @@
}
.ui-option-header-triangle-arrow {
- top:-10 * @unit_base;
+ top: -12 * @unit_base;
height:10 * @unit_base;
width:100%;
position:relative;
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less b/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less
index 2d2279ce..dd7369e1 100644..100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.swipelist.less
@@ -29,14 +29,18 @@
height: 100%;
z-index: 100;
- .ui-li-text-main {
- position: absolute;
- }
- .ui-li-text-sub-left {
- margin-top: 0.8em !important;
- margin-left: @list-li-padding-horizontal !important;
- }
- .ui-li-text-main-right {
- margin-top: 0.7em !important;
+
+ .ui-swipelist-item-cover-inner {
+ position : absolute;
+ padding-top : 30 * @unit_base;
+ padding-bottom : 30 * @unit_base;
+ padding-left : 16 * @unit_base;
+
+ width : 100%;
+
+ .ui-li-text-sub {
+ position : absolute;
+ padding-right : 16 * @unit_base;
+ }
}
}
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.triangle.less b/src/themes/tizen/common/jquery.mobile.tizen.triangle.less
index 732d9831..baa4e5d2 100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.triangle.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.triangle.less
@@ -1,4 +1,4 @@
-@triangle-size: 12px;
+@triangle-size: 10px;
.ui-triangle-container {
position: relative;
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.virtualgridview.less b/src/themes/tizen/common/jquery.mobile.tizen.virtualgridview.less
index 77e934f2..ecfb5f57 100755
--- a/src/themes/tizen/common/jquery.mobile.tizen.virtualgridview.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.virtualgridview.less
@@ -25,7 +25,7 @@
}
.ui-virtualgrid-content {
- background-color : black;
+ background-color : @color_virtualgrid_bg;
}
.ui-scrollbar-thumb-x {
diff --git a/src/themes/tizen/tizen-black/images/ajax-loader.png b/src/themes/tizen/tizen-black/images/ajax-loader.png
new file mode 100755
index 00000000..811a2cdd
--- /dev/null
+++ b/src/themes/tizen/tizen-black/images/ajax-loader.png
Binary files differ
diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less
index 90c79ea2..0196737e 100755
--- a/src/themes/tizen/tizen-black/style.less
+++ b/src/themes/tizen/tizen-black/style.less
@@ -78,7 +78,9 @@
@color_list_bubble_help_text: rgb(146, 146, 146);
@color_list_divider_bg : -webkit-linear-gradient(top, rgb(73,73,73) 0%,rgb(22,22,22) 100%);
@color_list_divider_text : rgb(142, 174, 193); /* #005ea0 */
+@color_list_divider_expand_div : rgba(0, 0, 0, 0.5);
@color_list_expandable_expanded_bg: rgb(26, 26, 26);
+@color_list_press : rgba(60, 100, 155, 1);
@font_size_list_main_text: 44 * @unit_base; //1.375rem; /* 44 px */
@font_size_list_sub_text: 32 * @unit_base; //1.0rem; /* 32 px */
@@ -111,25 +113,23 @@
/***************************************************************************
Popup
***************************************************************************/
-@color_popup_info_style: rgba(249, 249, 249, 1);
-@color_popup_basic_style_title: rgba(249, 249, 249, 1);
@color_popup_center_progressbar_title: rgba(153, 153, 153, 1);
@color_popup_text_progress_title: rgba(249, 249, 249, 1);
/* TODO : ninepatch popup title */
-@color_popup_title_bg: rgba(80, 147, 182, 255); /* popup_title_bg.png */
-@color_popup_text_bg: rgba(236, 240, 242, 255); /* popup_bg.png */
-@color_popup_button_bg: rgba(209, 221, 228, 255); /* popup_button_bg.png */
+@color_popup_title_bg: rgba(39, 58, 90, 255); /* popup_title_bg.png */
+@color_popup_text_bg: rgba(38, 38, 38, 255); /* popup_bg.png */
+@color_popup_button_bg: rgba(56, 56, 56, 255); /* popup_button_bg.png */
@color_popup_font: white;
-@color_popup_text_font: black;
+@color_popup_text_font: white;
-@color_popup_buttonbg: rgb(84, 126, 153);
-@color_popup_buttonbg_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(84, 126, 153)), to(rgb(69, 105, 128)));
-@color_popup_buttonbg_moz: -moz-linear-gradient(top, rgb(84, 126, 153), rgb(69, 105, 128));
+@color_popup_buttonbg: rgb(79, 79, 79);
+@color_popup_buttonbg_webkit: rgb(79, 79, 79);
+@color_popup_buttonbg_moz: rgb(79, 79, 79);
@color_popup_buttontext: rgb(249, 249, 249);
-@color_popup_buttonbg_over: rgb(94, 136, 163);
-@color_popup_buttonbg_press: rgb(67, 160, 217);
-@color_popup_buttonbg_press_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(67, 160, 217)), to(rgb(56, 139, 185)));
-@color_popup_buttonbg_press_moz: -moz-linear-gradient(top, rgb(67, 160, 217), rgb(56, 139, 185));
+@color_popup_buttonbg_over: rgb(79, 79, 79); /* transparents */
+@color_popup_buttonbg_press: rgb(42, 137, 194);
+@color_popup_buttonbg_press_webkit: rgb(42, 137, 194);
+@color_popup_buttonbg_press_moz: rgb(42, 137, 194);
@font_size_popup_info_style: 42 * @unit_base; //1.3125rem; /* 42px */
@font_size_popup_basic_style_title: 38 * @unit_base; //1.1875rem; /* 38px */
@@ -162,13 +162,11 @@
Button
***************************************************************************/
-@color_button_normal: rgb(151, 161, 167);
-@color_button_normal_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(151, 161, 167)), to(rgb(122, 132, 141)));
-@color_button_normal_moz: -moz-linear-gradient(top, rgb(151, 161, 167), rgb(122, 132, 141));
+@color_button_normal: rgb(53, 53, 57);
+@color_button_normal_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(53, 53, 57)), to(rgb(40, 41, 44)));
+@color_button_normal_moz: -moz-linear-gradient(top, rgb(53, 53, 57), rgb(40, 41, 44));
-@color_button_press: rgb(67, 160, 217);
-@color_button_press_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(67, 160, 217)), to(rgb(56, 139, 185)));
-@color_button_press_moz: -moz-linear-gradient(top, rgb(67, 160, 217), rgb(56, 139, 185));
+@color_button_press: rgb(42, 137, 194);
@color_button_hover: rgb(161, 171, 177);
@@ -179,9 +177,7 @@
@color_circlebutton_hover: rgb(239, 119, 126);
@color_circlebutton_hover_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(198, 78, 85)), to(rgb(166, 43, 45)));
@color_circlebutton_hover_moz: -moz-linear-gradient(top, rgb(198, 78, 85), rgb(166,43,45));
-@color_circlebutton_press: rgb(67, 160, 217);
-@color_circlebutton_press_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(67, 160, 217)), to(rgb(56, 139, 185)));
-@color_circlebutton_press_moz: -moz-linear-gradient(top, rgb(67, 160, 217), rgb(56, 139, 185));
+@color_circlebutton_press: rgb(42, 137, 194);
@color_button_EditText: rgb(249, 249, 249);
@color_button_EditTextPress: rgb(249, 249, 249);
@@ -202,9 +198,9 @@
@radius_button_switch: 4px;
@radius_button_switch_reed: 2px;
-@color_button_edit: rgb(201, 88, 88);
-@color_button_edit_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(201, 88, 88)), to(rgb(161, 40, 40)));
-@color_button_edit_moz: -moz_linear-gradient(top, rgb(201, 88, 88), rgb(161, 40, 40));
+@color_button_edit: rgb(192, 82, 82);
+@color_button_edit_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(192, 82, 82)), to(rgb(162, 40, 40)));
+@color_button_edit_moz: -moz_linear-gradient(top, rgb(192, 88, 88), rgb(162, 40, 40));
@color_button_edit_press: rgb(147, 24, 24);
@color_button_edit_press_webkit: -webkit-gradient(linear, left top, left bottom, from(rgb(147, 24,24)), to(rgb(110, 23, 23)));
@@ -224,8 +220,6 @@
.LESSbutton_down_style{
background: @color_button_press;
- background: @color_button_press_webkit;
- background: @color_button_press_moz;
color: @color_button_text_white;
}
@@ -253,8 +247,6 @@
.LESScirclebutton_press_style{
border-width: 0px;
background: @color_circlebutton_press;
- background: @color_circlebutton_press_webkit;
- background: @color_circlebutton_press_moz;
}
.LESStoggleswitch_on_style{
@@ -311,29 +303,29 @@
/***************************************************************************
Contextual Popup
***************************************************************************/
-@color_ctxpopup_text: rgb(19, 58, 83);
-@color_ctxpopup_background: rgb(219, 229, 239);
-@color_ctxpopup_border_left: rgb(225, 235, 241);
-@color_ctxpopup_border_right: rgb(174, 184, 190);
-@color_ctxpopup_border_bottom: rgb(153, 176, 195);
-@color_ctxpopup_timepicker_text: rgb( 105, 151, 173 );
-@color_ctxpopup_timepicker_text_focus: rgb( 249, 249, 249 );
+@color_ctxpopup_text: rgb(249, 249, 249);
+@color_ctxpopup_background: rgb(52, 52, 52);
+@color_ctxpopup_border_left: rgb(39, 39, 39);
+@color_ctxpopup_border_right: rgb(82, 82, 82);
+@color_ctxpopup_border_bottom: rgb(89, 89, 89);
+@color_ctxpopup_timepicker_text: rgba( 249, 249, 249, 0.7 );
+@color_ctxpopup_timepicker_text_focus: rgba( 249, 249, 249, 1 );
/***************************************************************************
DaySelector
***************************************************************************/
@color_dayselector_Btn_Sat: rgba(0, 168, 231, 1); /* #00a8e7 */
@color_dayselector_Btn_Sun: rgba(240, 20, 2, 1); /* #f01402 */
-@color_dayselector_Btn_Mon_to_Fri: rgba(249, 249, 249, 1); /* #f9f9f9 */
-@color_dayselector_Btn_border: rgba(26, 82, 116, 1); /* #f9f9f9 */
-@color_dayselector_Btn_normal: -webkit-linear-gradient(top, rgb(125,157,178) 0%,rgb(84,121,144) 100%);
-@color_dayselector_Btn_press: -webkit-linear-gradient(top, rgb(59,119,150) 0%,rgb(47,91,117) 100%);
+@color_dayselector_Btn_Mon_to_Fri: rgba(249, 249, 249, 1); /* #f9f9f9 */
+@color_dayselector_Btn_border: rgba(0, 0, 0, 0.1); /* #000000 */
+@color_dayselector_Btn_normal: -webkit-linear-gradient(top, rgb(48,65,95) 0%,rgb(30,43,62) 100%);
+@color_dayselector_Btn_press: -webkit-linear-gradient(top, rgb(71,98,141) 0%,rgb(52,75,112) 100%);
/***************************************************************************
OptionHeader
***************************************************************************/
-@color_optionheader_Background: rgba(40, 55, 81, 1);
+@color_optionheader_Background: rgba(55, 76, 111, 1);
@color_optionheader_bt: -webkit-linear-gradient(top, rgb(85,113,160) 0%,rgb(68,95,139) 100%);
@color_optionheader_bt_press: -webkit-linear-gradient(top, rgb(42,137,193) 0%,rgb(27,106,153) 100%);
@color_optionheader_tab_text: rgba(249, 249, 249, 1); /* #f9f9f9 */
@@ -342,9 +334,9 @@
/***************************************************************************
SearchBar(forms.textinput)
***************************************************************************/
-@color_searchbar_bg : rgba(215, 225, 232, 1); /* #242424 */
-@color_searchbar_default_text : rgba(121, 131, 138, 1); /* #828282 */
-@color_searchbar_input_field_bg : rgba(249, 249, 249, 1); /* #F9F9F9*/
+@color_searchbar_bg : rgba(47, 53, 64, 1);
+@color_searchbar_default_text : rgba(68, 93, 111, 1);
+@color_searchbar_input_field_bg : rgba(0, 0, 0, 1);
/***************************************************************************
@@ -359,7 +351,7 @@
/***************************************************************************
ControlGroup
***************************************************************************/
-@color_controlgroup_btn_border : rgba(26, 82, 116, 1); /* #252525 */
+@color_controlgroup_btn_border : rgba(0, 0, 0, 0.1); /* #000000 */
/***************************************************************************
@@ -380,15 +372,15 @@
@color_bar_title_text : rgba(249, 249, 249, 1); /* #F9F9F9 */
@color_bar_title_bg : -webkit-linear-gradient(top, rgb(68,88,120) 0%,rgb(24,37,56) 100%);
-@color_bar_title_btn_border : rgba(0, 0, 0, 0.4);
+@color_bar_title_btn_border : rgba(0, 0, 0, 0.2);
@color_bar_footer_bg : -webkit-linear-gradient(top, rgb(43,54,71) 0%,rgb(17,24,35) 100%);
@color_bar_footer_btn_bg : transparent;
@color_controlbar_btn_border : rgba(0, 0, 0, 0.1); /* #000000 */
-@color_controlbar_tabbbar_bg : -webkit-linear-gradient(top, rgb(37,51,74) 0%,rgb(26,36,52) 100%);
-@color_controlbar_toolbbar_bg : -webkit-linear-gradient(top, rgb(42,52,69) 0%,rgb(17,24,35) 100%);
-@color_controlbar_bg : -webkit-linear-gradient(top, rgb(156,181,179) 0%,rgb(79,116,141) 100%);
+@color_controlbar_tabbbar_bg : -webkit-linear-gradient(top, rgb(43,54,71) 0%,rgb(17,24,35) 100%);
+@color_controlbar_toolbbar_bg : -webkit-linear-gradient(top, rgb(43,54,71) 0%,rgb(17,24,35) 100%);
+@color_controlbar_bg : -webkit-linear-gradient(top, rgb(43,54,71) 0%,rgb(17,24,35) 100%);
@color_controlbar_btn_text : rgba(249, 249, 249, 1); /* #F9F9F9 */
@color_controlbar_btn_press : -webkit-linear-gradient(top, rgb(60,81,114) 0%,rgb(42,58,85) 100%);
@@ -401,6 +393,7 @@
@color_ticker_bg: rgb(60, 84, 123);
@color_ticker_text1: rgb(249, 249, 249);
@color_ticker_text2: rgb(211, 216, 224);
+@color_ticker_btn: rgb(59, 81, 116);
/***************************************************************************
@@ -438,9 +431,9 @@
/***************************************************************************
multimediaview
***************************************************************************/
-@color_multimediaview_bg : rgb(249, 249, 249);
-@color_multimediaview_control_bg : rgba(249, 249, 249, 0.5);
-@color_multimediaview_button_bg : rgb(249, 249, 249);
+@color_multimediaview_bg : rgb(0, 0, 0);
+@color_multimediaview_control_bg : rgba(0, 0, 0, 0.5);
+@color_multimediaview_button_bg : rgb(36, 36, 36);
@color_multimediaview_timestamp_text : rgb(42, 137, 194);
@color_multimediaview_duration_text : rgb(128, 128, 128);
@color_multimediaview_bar_gray : rgb(178, 178, 178);
@@ -450,9 +443,9 @@
/***************************************************************************
Color widgets
***************************************************************************/
-@color_widgets_title_bg: rgb(235, 239, 241);
-@color_widgets_basic_border: rgb(192, 192, 192);
-@color_widgets_left_border: rgb(108, 168, 199);
+@color_widgets_title_bg: rgb(26, 26, 26);
+@color_widgets_basic_border: rgb(32, 32, 32);
+@color_widgets_left_border: rgb(45, 51, 74);
.LESScolortitle_background_style{
background-color: @color_widgets_title_bg;
@@ -474,25 +467,30 @@
background-color: @color_widgets_title_bg;
border: 1px solid;
border-top: 6px solid;
- border-color: @color_widgets_basic_border;
+ border-color: @color_widgets_left_border;
}
/***************************************************************************
multibutton entry
***************************************************************************/
-@color_multibuttonentry_bg : rgb(249, 249, 249);
+@color_multibuttonentry_bg : rgb(0, 0, 0);
@color_multibuttonentry_block_text : rgb(255, 255, 255);
@color_multibuttonentry_block_bg : rgb(60, 100, 155);
@color_multibuttonentry_block_border : rgb(85, 131, 174);
@color_multibuttonentry_press_bg : rgb(41, 137, 194);
@color_multibuttonentry_press_border : rgb(93, 187, 244);
-@color_multibuttonentry_input_text : #222222;
-@color_multibuttonentry_link : rgb(100, 100, 100);
-@color_multibuttonentry_dim : rgb(128, 128, 128);
+@color_multibuttonentry_input_text : rgb(255, 255, 255);
+@color_multibuttonentry_link_bg : rgb(100, 100, 100);
+@color_multibuttonentry_link : rgb(249, 249, 249);
+
+/***************************************************************************
+***************************************************************************/
/***************************************************************************
+ virtualgrid
***************************************************************************/
+@color_virtualgrid_bg : rgb(0, 0, 0);
/***************************************************************************
****************************************************************************
diff --git a/src/themes/tizen/tizen-white/images/ajax-loader.png b/src/themes/tizen/tizen-white/images/ajax-loader.png
new file mode 100755
index 00000000..811a2cdd
--- /dev/null
+++ b/src/themes/tizen/tizen-white/images/ajax-loader.png
Binary files differ
diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less
index 069b349f..4227e6d2 100755
--- a/src/themes/tizen/tizen-white/style.less
+++ b/src/themes/tizen/tizen-white/style.less
@@ -78,7 +78,9 @@
@color_list_bubble_help_text: rgb(146, 146, 146);
@color_list_divider_bg : rgb(209, 227, 238); /* #d1e3ee */
@color_list_divider_text : rgb(29, 100, 149);
+@color_list_divider_expand_div : rgba(0, 0, 0, 0.5);
@color_list_expandable_expanded_bg: rgb(215, 225, 232);
+@color_list_press : rgba(42, 137, 194, 1);
@font_size_list_main_text: 44 * @unit_base; //1.375rem; /* 44 px */
@font_size_list_sub_text: 32 * @unit_base; //1.0rem; /* 32 px */
@@ -112,8 +114,6 @@
/***************************************************************************
Popup
***************************************************************************/
-@color_popup_info_style: rgba(249, 249, 249, 1);
-@color_popup_basic_style_title: rgba(249, 249, 249, 1);
@color_popup_center_progressbar_title: rgba(153, 153, 153, 1);
@color_popup_text_progress_title: rgba(249, 249, 249, 1);
/* TODO : ninepatch popup title */
@@ -316,8 +316,8 @@
@color_ctxpopup_border_left: rgb(225, 235, 241);
@color_ctxpopup_border_right: rgb(174, 184, 190);
@color_ctxpopup_border_bottom: rgb(153, 176, 195);
-@color_ctxpopup_timepicker_text: rgb( 105, 151, 173 );
-@color_ctxpopup_timepicker_text_focus: rgb( 249, 249, 249 );
+@color_ctxpopup_timepicker_text: rgba( 249, 249, 249, 0.4 );
+@color_ctxpopup_timepicker_text_focus: rgba( 249, 249, 249, 1 );
/***************************************************************************
DaySelector
@@ -380,7 +380,7 @@
@color_bar_title_text : rgba(249, 249, 249, 1); /* #F9F9F9 */
@color_bar_title_bg : -webkit-linear-gradient(top, rgb(90,153,186) 0%,rgb(32,84,115) 100%);
-@color_bar_title_btn_border : rgba(0, 0, 0, 0.4);
+@color_bar_title_btn_border : rgba(36, 93, 128, 0.4); /* 00_winset_divider_line.png temp value */
@color_bar_footer_bg : -webkit-linear-gradient(top, rgb(156,181,179) 0%,rgb(79,116,141) 100%);
@color_bar_footer_btn_bg : transparent;
@@ -401,6 +401,7 @@
@color_ticker_bg: rgb(13, 60, 89);
@color_ticker_text1: rgb(249, 249, 249);
@color_ticker_text2: rgb(202, 211, 217);
+@color_ticker_btn: rgb(22, 76, 110);
/***************************************************************************
@@ -483,18 +484,23 @@
***************************************************************************/
@color_multibuttonentry_bg : rgb(249, 249, 249);
@color_multibuttonentry_block_text : rgb(255, 255, 255);
-@color_multibuttonentry_block_bg : rgb(60, 100, 155);
-@color_multibuttonentry_block_border : rgb(85, 131, 174);
-@color_multibuttonentry_press_bg : rgb(41, 137, 194);
-@color_multibuttonentry_press_border : rgb(93, 187, 244);
+@color_multibuttonentry_block_bg : rgb(93, 160, 196);
+@color_multibuttonentry_block_border : rgb(88, 150, 184);
+@color_multibuttonentry_press_bg : rgb(40, 106, 145);
+@color_multibuttonentry_press_border : rgb(49, 126, 171);
@color_multibuttonentry_input_text : #222222;
-@color_multibuttonentry_link : rgb(100, 100, 100);
-@color_multibuttonentry_dim : rgb(128, 128, 128);
+@color_multibuttonentry_link_bg : rgb(178, 178, 178);
+@color_multibuttonentry_link : rgb(249, 249, 249);
/***************************************************************************
***************************************************************************/
/***************************************************************************
+ virtualgrid
+***************************************************************************/
+@color_virtualgrid_bg : rgb(255, 255, 255);
+
+/***************************************************************************
****************************************************************************
Layout ( position, padding, margin etc...)
****************************************************************************
diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
index be2e8152..6bc7f047 100644
--- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
+++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
@@ -342,6 +342,14 @@
return;
}
+ if ( !this._dragging ) {
+ return;
+ }
+
+ if ( scroll_height < 0 ) {
+ return;
+ }
+
if ( y > 0 ) {
sy = -y;
} else if ( y < -scroll_height ) {
diff --git a/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js b/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js
index da71b460..c1a7e529 100644
--- a/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js
+++ b/src/widgets/datetimepicker/js/jquery.mobile.tizen.datetimepicker.js
@@ -634,7 +634,8 @@
$div,
$ctx,
$li,
- i;
+ i,
+ newLeft = 10;
if ( !attr ) {
return;
@@ -675,8 +676,11 @@
$(window).bind("resize", obj._reflow);
}
// cause ctxpopup forced to subtract 10
+ if( $(window).width() / 2 < target.offset().left ) {
+ newLeft = -10;
+ }
$ctx.popupwindow( 'open',
- target.offset().left + ( target.width() / 2 ) + 10 - window.pageXOffset ,
+ target.offset().left + ( target.width() / 2 ) + newLeft - window.pageXOffset ,
target.offset().top + target.height() - window.pageYOffset );
$div.bind('popupafterclose', function ( e ) {
if ( obj._reflow ) {
diff --git a/src/widgets/multimediaview/js/jquery.mobile.tizen.multimediaview.js b/src/widgets/multimediaview/js/jquery.mobile.tizen.multimediaview.js
index 24200cc2..e197dcca 100755
--- a/src/widgets/multimediaview/js/jquery.mobile.tizen.multimediaview.js
+++ b/src/widgets/multimediaview/js/jquery.mobile.tizen.multimediaview.js
@@ -183,9 +183,11 @@
control = view.parent().find( ".ui-multimediaview-control" ),
buttons = control.find( ".ui-button" ),
playpauseButton = control.find( ".ui-playpausebutton" ),
- volumeControl = control.find( ".ui-volumecontrol" ),
seekBar = control.find( ".ui-seekbar" ),
durationLabel = control.find( ".ui-durationlabel" ),
+ timestampLabel = control.find( ".ui-timestamplabel" ),
+ volumeControl = control.find( ".ui-volumecontrol" ),
+ volumeBar = volumeControl.find( ".ui-volumebar" ),
controlWidth = width,
controlHeight = control.outerHeight( true ),
availableWidth = 0,
@@ -218,6 +220,12 @@
if ( viewElement.autoplay && viewElement.paused === false ) {
playpauseButton.removeClass( "ui-play-icon" ).addClass( "ui-pause-icon" );
}
+
+ if ( seekBar.width() < ( volumeBar.width() + timestampLabel.width() + durationLabel.width() ) ) {
+ durationLabel.hide();
+ } else {
+ durationLabel.show();
+ }
},
_resizeFullscreen : function ( isFullscreen ) {
var self = this,
@@ -363,10 +371,12 @@
}
});
- fullscreenButton.bind( "vclick.multimediaview", function () {
+ fullscreenButton.bind( "vclick.multimediaview", function ( e ) {
self.fullscreen( !self.options.fullscreen );
control.fadeIn( "fast" );
self._endTimer();
+ e.preventDefault();
+ e.stopPropagation();
});
seekBar.bind( "vmousedown.multimediaview", function ( e ) {
diff --git a/src/widgets/notification/js/jquery.mobile.tizen.notification.js b/src/widgets/notification/js/jquery.mobile.tizen.notification.js
index 4f1ad0c9..45f11808 100644
--- a/src/widgets/notification/js/jquery.mobile.tizen.notification.js
+++ b/src/widgets/notification/js/jquery.mobile.tizen.notification.js
@@ -133,6 +133,10 @@
.removeClass("fix");
this.running = true;
+
+ if ( this.type === 'popup' ) {
+ this._set_position();
+ }
},
close: function () {
@@ -149,7 +153,7 @@
this.running = false;
},
- close: function () {
+ distroy: function () {
var container = this._get_container();
$( container ).removeClass("show")
@@ -270,10 +274,12 @@
this._add_event();
$( window ).bind( "resize", function () {
- if ( self.running ) {
- self._refresh();
+ if ( !self.running ) {
+ return;
}
+ self._refresh();
+
if ( self.type === 'popup' ) {
self._set_position();
}
@@ -287,6 +293,6 @@
});
$( document ).bind( "pagebeforehide", function ( e ) {
- $( e.target ).find(":jqmData(role='notification')").notification('close');
+ $( e.target ).find(":jqmData(role='notification')").notification('destroy');
});
}( jQuery, this ));
diff --git a/src/widgets/optionheader/js/jquery.mobile.tizen.optionheader.js b/src/widgets/optionheader/js/jquery.mobile.tizen.optionheader.js
index e8e18679..953936cc 100755
--- a/src/widgets/optionheader/js/jquery.mobile.tizen.optionheader.js
+++ b/src/widgets/optionheader/js/jquery.mobile.tizen.optionheader.js
@@ -196,29 +196,21 @@
_setArrowLeft: function () {
var matchingBtn = $( this.element ).jqmData( "for" ),
- arrowCenter = 14,
- btn2Position = 10,
- btn3Position = 144,
+ arrowCenter = 12,
matchBtn = $( this.element ).parents( ".ui-page" ).find( "#" + matchingBtn ),
- buttonRight = matchBtn.nextAll().is( "a" ) ? btn3Position : btn2Position,
+ siblingBtnCnt = matchBtn.prevAll(".ui-btn-right").length,
scaleFactor = ( 36 / parseInt( $('html').css('font-size'), 10 ) );
- if ( $(this.element).parents(".ui-page").find( "#" + matchingBtn ).length != 0 ) {
+ if ( $(this.element).parents(".ui-page").find( "#" + matchingBtn ).length != 0 ) {
if ( this.options.expandable ) {
matchBtn.bind( 'vclick', this.clickHandler );
} else {
matchBtn.unbind( 'vclick', this.clickHandler );
}
- // decide arrow Button position
- if ( matchBtn.css( "left" ) && matchBtn.css( "left" ) != "auto" ) {
- $( ".ui-triangle-image" ).css( "left", matchBtn.width() / 2 + parseInt(matchBtn.css( "left" ), 10) - arrowCenter + "px" );
- } else if ( matchBtn.css("right") ) {
- $( ".ui-triangle-image" ).css( "left", document.documentElement.clientWidth - ( matchBtn.width() / 2 + buttonRight / scaleFactor ) - arrowCenter + "px" );
- }
- } else {
- $( ".ui-triangle-image" ).css( "left", document.documentElement.clientWidth / 2 - arrowCenter + "px" );
+ $( ".ui-triangle-image" ).css( "right", ( matchBtn.width() / 2 + matchBtn.width() * siblingBtnCnt - arrowCenter) / scaleFactor + "px");
+ $( ".ui-triangle-image" ).css( "left", "auto" );
}
},
// Draw the option header, according to current options
@@ -406,8 +398,9 @@
ExpandedTop = ( ExpandedTop / scaleFactor );
if ( $( window ).scrollTop() <= CollapsedTop ) {
- toggle_header.css( "position", "relative" );
- toggle_content.css( "top", "0px" );
+/* toggle_header.css( "position", "relative" );
+ toggle_content.css( "top", "0px" ); */
+/* tizen beta request : optionheader remove slide */
}
if ( this.isCollapsed ) {
@@ -415,8 +408,9 @@
if ( $( window ).scrollTop() <= ExpandedTop ) {
CalculateTime = setTimeout( function () {
- toggle_header.css( 'position', 'fixed' );
- toggle_content.css( 'top', ExpandedTop + "px" );
+/* toggle_header.css( 'position', 'fixed' );
+ toggle_content.css( 'top', ExpandedTop + "px" );*/
+/* tizen beta request : optionheader remove slide */
}, 500 );
} else {
// Need to move scroll top
@@ -428,8 +422,9 @@
this.collapse( options );
if ( $(window).scrollTop() <= ExpandedTop ) {
CalculateTime = setTimeout( function () {
- toggle_header.css( 'position', 'fixed' );
- toggle_content.css( 'top', CollapsedTop + "px" );
+/* toggle_header.css( 'position', 'fixed' );
+ toggle_content.css( 'top', CollapsedTop + "px" );*/
+/* tizen beta request : optionheader remove slide */
}, 500 );
} else {
toggle_header.css( 'position', 'fixed' );
diff --git a/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js b/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js
index 9293c823..dddd28d4 100755
--- a/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js
+++ b/src/widgets/popupwindow/js/jquery.mobile.tizen.popupwindow.js
@@ -266,6 +266,8 @@
top: newtop,
left: newleft
});
+
+ this._ui.screen.css( "height", screenHeight );
},
open: function ( x_where, y_where ) {
@@ -287,7 +289,7 @@
}
} );
- this._ui.screen.css( "height", "100%" )
+ this._ui.screen.css( "height", $( window ).height() )
.removeClass("ui-screen-hidden");
if ( this.options.fade ) {
diff --git a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
index 51ade9c8..955fcf19 100755
--- a/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
+++ b/src/widgets/searchbar/js/jquery.mobile.tizen.searchbar.js
@@ -275,6 +275,10 @@
}
} );
}
+
+ if ( input.val() ) {
+ searchicon.hide();
+ }
},
disable: function () {