Export 0.1.45

12 files changed, 144 insertions, 48 deletions

diff --git a/src/themes/tizen/common/jquery.mobile.listview.less b/src/themes/tizen/common/jquery.mobile.listview.less
index 40f21b0b..c9a1d73c 100755
--- a/src/themes/tizen/common/jquery.mobile.listview.less
+++ b/src/themes/tizen/common/jquery.mobile.listview.less
@@ -120,7 +120,6 @@
 	padding:0;
 
 	font-size : @list-font-size-main;
-
 }
 .ui-li,
 .ui-li.ui-field-contain {
@@ -131,7 +130,6 @@
 	text-align: left;
 }
 .ui-li {
-	
 	h3 {
 		margin-top	: 0px;
 		margin-bottom : 0px;
@@ -140,6 +138,10 @@
 		min-height	: 52 * @unit_base;
 		font-weight : normal;
 	}
+
+	form {
+		display : inline-block;
+	}
 	.ui-btn {
 		top: 50%;
 		margin-top: -0.8em;
@@ -165,7 +167,6 @@
 
 	&>.ui-btn-inner.ui-btn-hastxt {
 		padding: 0px 0px;
-		
 	}
 
 	.ui-btn-inner a.ui-link-inherit,
@@ -175,6 +176,10 @@
 		padding-left : 16 * @unit_base;
 		padding-right : 16 * @unit_base;
 		display: block;
+
+		overflow:hidden;
+		white-space : nowrap;
+		text-overflow : ellipsis;
 	}
 
 	.ui-toggleswitch {
@@ -268,12 +273,16 @@ li.ui-li-thumbnail-right {
 	&.ui-li-static {
 		padding-top : 10 * @unit_base;
 		padding-bottom : 58 * @unit_base;
-/*		padding-left : 16 * @unit_base;
-		padding-right : 16 * @unit_base;
-		display: block;*/
 
 		min-height : 60 * @unit_base;
 	}
+
+	a {
+		overflow:hidden;
+		white-space : nowrap;
+		text-overflow : ellipsis;
+		padding-right : 16 * @unit_base; /* ellipsis for normal text */
+	}
 }
 
 
@@ -338,8 +347,6 @@ li.ui-li-thumbnail-right {
 	border-left-width : 1px;
 	border-left-style : solid;
 	border-left-color : @color_list_divider_expand_div;
-
-
 }
 
 
@@ -351,6 +358,7 @@ li.ui-li-thumbnail-right {
 	}
 	.ui-li-text-sub {
 		padding-left: 104 * @unit_base;
+		padding-right: 16 * @unit_base; /* ellipsis for sub text */
 	}
 }
 
@@ -379,6 +387,35 @@ li.ui-li-thumbnail-right {
 	}
 }
 
+.ui-li.ui-li-has-right-circle-btn {
+	.ui-btn-inner a {
+		padding-right : 96 * @unit_base;
+	}
+}
+
+.ui-li.ui-li-has-right-btn {
+	.ui-btn-inner a {
+		padding-right : 256 * @unit_base;
+	}
+}
+
+.ui-li.ui-li-thumbnail-right {
+	.ui-btn-inner a {
+		padding-right : 104 * @unit_base;
+	}
+}
+.ui-li.ui-li-static.ui-li-has-right-circle-btn {
+	padding-right : 96 * @unit_base;
+}
+
+.ui-li.ui-li-static.ui-li-has-right-btn {
+	padding-right : 256 * @unit_base;
+}
+
+.ui-li.ui-li-static.ui-li-thumbnail-right {
+	padding-right : 104 * @unit_base;
+}
+
 .ui-li-has-icon {
 	.ui-btn-inner a.ui-link-inherit,
 	&.ui-li-static {
@@ -429,18 +466,22 @@ li.ui-li-thumbnail-right {
 	text-align: right;
 	font-size: @font_size_list_sub_text;
 	color: @color_list_sub_text_default;
-/*	top: 50%;
-	margin-top: -0.5em;*/
 
 	position : absolute;
 	right : 16 * @unit_base;
 	top : 16 * @unit_base;
-		> img {
-			position : relative;
-			width: @list-smallicon-size;
-			height: @list-smallicon-size;
-			margin: 0 @list-li-padding-horizontal 0 @list-li-padding-horizontal;
-		}
+
+	overflow:hidden;
+	white-space : nowrap;
+	text-overflow : ellipsis;
+	width	: 95%;
+
+	> img {
+		position : relative;
+		width: @list-smallicon-size;
+		height: @list-smallicon-size;
+		margin: 0 @list-li-padding-horizontal 0 @list-li-padding-horizontal;
+	}
 }
 
 .ui-li-text-sub2 {
@@ -453,16 +494,20 @@ li.ui-li-thumbnail-right {
 	right : 16 * @unit_base;
 	top : 16 * @unit_base;
 
-		> img {
-			width: @list-smallicon-size;
-			height: @list-smallicon-size;
-			margin: 0 0 0 @list-li-padding-horizontal;
-		}
+	overflow:hidden;
+	white-space : nowrap;
+	text-overflow : ellipsis;
+	width : 60%;
+
+	> img {
+		width: @list-smallicon-size;
+		height: @list-smallicon-size;
+		margin: 0 0 0 @list-li-padding-horizontal;
+	}
 }
 /*
 li:not(.ui-li-has-multiline) .ui-li-text-sub {
 	position : absolute;
-
 	right : 16 * @unit_base;
 	top: 22 * @unit_base;
 	margin-top: 0px;
@@ -470,11 +515,18 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 .ui-li-has-multiline .ui-li-text-sub {
 	position : absolute;
 
+	text-align: left;
 	right : auto;
 	left : 16 * @unit_base;
 	top: 70 * @unit_base;
 	margin-top: 0px;
 
+	overflow:hidden;
+	white-space : nowrap;
+	text-overflow : ellipsis;
+
+	/* ellipsis for multiline list */
+	width : 90%;
 }
 
 .ui-li-icon-sub-right,
@@ -512,6 +564,11 @@ li:not(.ui-li-has-multiline) .ui-li-text-sub {
 			background : @color_list_dialogue_bg;
 		}
 	}
+	&> li.ui-li-dialogue.ui-li-expanded {
+		padding-left : 44 * @unit_base;
+		min-height : 52 * @unit_base;
+	}
+
 
 	&> li.ui-li-dialogue.ui-li-divider {
 		height: 32 * @unit_base;
diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less
index fed7e94d..d01bda59 100755
--- a/src/themes/tizen/common/jquery.mobile.theme.less
+++ b/src/themes/tizen/common/jquery.mobile.theme.less
@@ -660,7 +660,7 @@ a.ui-link-inherit {
 	}
 
 	.ui-btn , .ui-btn-icon-top, .ui-btn-hover-s, .ui-btn-active, .ui-btn-up-s{
-		.ui-btn-inner{
+		.ui-btn-inner:not(.ui-btn-icon-only) {
 			padding-top : 40 * @unit_base;
 			padding-bottom : 39 * @unit_base;
 		}
diff --git a/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less b/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less
index 031b020c..ffdc4dec 100644
--- a/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less
+++ b/src/themes/tizen/common/jquery.mobile.tizen.popupwindow.less
@@ -358,7 +358,7 @@
 		.popup-scroller-bg {
 			width: 100%;
 			overflow: hidden;
-			background: black;
+			background: @color_popup_scroller_bg;
 
 			.ui-listview {
 				height: 512*@unit_base;
diff --git a/src/themes/tizen/tizen-black/style.less b/src/themes/tizen/tizen-black/style.less
index 0196737e..fdfee789 100755
--- a/src/themes/tizen/tizen-black/style.less
+++ b/src/themes/tizen/tizen-black/style.less
@@ -131,6 +131,8 @@
 @color_popup_buttonbg_press_webkit:	rgb(42, 137, 194);
 @color_popup_buttonbg_press_moz:	rgb(42, 137, 194);
 
+@color_popup_scroller_bg:	rgb(0, 0, 0);
+
 @font_size_popup_info_style:			42 * @unit_base; //1.3125rem;	/* 42px */
 @font_size_popup_basic_style_title:		38 * @unit_base; //1.1875rem;	/* 38px */
 @font_size_popup_center_progressbar_title:	26 * @unit_base; //0.8125rem;	/* 26px */
diff --git a/src/themes/tizen/tizen-white/style.less b/src/themes/tizen/tizen-white/style.less
index 4227e6d2..c1c91d8d 100755
--- a/src/themes/tizen/tizen-white/style.less
+++ b/src/themes/tizen/tizen-white/style.less
@@ -132,6 +132,8 @@
 @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_scroller_bg:	rgb(249, 249, 249);
+
 @font_size_popup_info_style:			42 * @unit_base; //1.3125rem;	/* 42px */
 @font_size_popup_basic_style_title:		38 * @unit_base; //1.1875rem;	/* 38px */
 @font_size_popup_center_progressbar_title:	26 * @unit_base; //0.8125rem;	/* 26px */
diff --git a/src/widgets/circularview/js/jquery.mobile.tizen.circularview.js b/src/widgets/circularview/js/jquery.mobile.tizen.circularview.js
index c23f896f..b45c513f 100755
--- a/src/widgets/circularview/js/jquery.mobile.tizen.circularview.js
+++ b/src/widgets/circularview/js/jquery.mobile.tizen.circularview.js
@@ -53,7 +53,7 @@
 	};
 
 	function getCurrentTime() {
-		return ( new Date()).getTime();
+		return Date.now();
 	}
 
 	$.extend( MomentumTracker.prototype, {
diff --git a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
index 6bc7f047..08ff1499 100644
--- a/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
+++ b/src/widgets/common/js/jquery.mobile.tizen.scrollview.js
@@ -35,7 +35,7 @@
 	};
 
 	function getCurrentTime() {
-		return ( new Date() ).getTime();
+		return Date.now();
 	}
 
 	jQuery.widget( "tizen.scrollview", jQuery.mobile.widget, {
@@ -470,6 +470,13 @@
 					target.is( '.ui-btn-inner' ) ||
 					target.is( '.ui-btn-inner .ui-icon' );
 
+			if ( this._is_button ) {
+				if ( target.parents('.ui-slider-handle') ) {
+					this._skip_dragging = true;
+					return;
+				}
+			}
+
 			/*
 			 * We need to prevent the default behavior to
 			 * suppress accidental selection of text, etc.
@@ -816,11 +823,13 @@
 					focused.trigger("resize.scrollview");
 				}
 
-				/* calibration */
-				if ( self._sy < $c.height() - $v.height() ) {
-					self.scrollTo( 0, self._sy,
-						self.options.snapbackDuration );
-				}
+				/* calibration - after triggered throttledresize */
+				setTimeout( function () {
+					if ( self._sy < $c.height() - $v.height() ) {
+						self.scrollTo( 0, self._sy,
+							self.options.snapbackDuration );
+					}
+				}, 260 );
 
 				self._view_height = $v.height();
 			});
diff --git a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
index 94ea751c..7c5348ca 100755
--- a/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
+++ b/src/widgets/controlbar/js/jquery.mobile.tizen.controlbar.js
@@ -155,7 +155,8 @@
 			});
 
 			$( document ).bind( "pageshow", function ( e, ui ) {
-				var controlbar_filter = $( ".ui-page" ).find( ":jqmData(role='footer')" ).eq( 0 ).find( ":jqmData(role='controlbar')" ),
+				var controlbar_filter = $( ".ui-page-active" ).find( ":jqmData(role='footer')" ).eq( 0 ).find( ":jqmData(role='controlbar')" ),
+					element_width = 0,
 					element_count = controlbar_filter.find( 'li' ).length;
 
 				if ( controlbar_filter.find(".ui-btn-active").length == 0 ) {
@@ -171,6 +172,22 @@
 						.css( "width", controlbar_filter.width() )
 						.css( "height", controlbar_filter.height() );
 				}
+
+				if ( controlbar_filter.length ) {
+					element_width = Math.floor( controlbar_filter.outerWidth() / element_count );
+					controlbar_filter.find("li:last").width( controlbar_filter.outerWidth() - element_width * ( element_count - 1 ) );
+				}
+			});
+
+			$( window ).bind( "resize", function ( e ) {
+				var controlbar_filter = $( ".ui-page-active" ).find( ":jqmData(role='footer')" ).eq( 0 ).find( ":jqmData(role='controlbar')" ),
+					element_width = 0,
+					element_count = controlbar_filter.find( 'li' ).length;
+
+				if ( controlbar_filter.length ) {
+					element_width = Math.floor( controlbar_filter.outerWidth() / element_count );
+					controlbar_filter.find("li:last").width( controlbar_filter.outerWidth() - element_width * ( element_count - 1 ) );
+				}
 			});
 
 			this._bindControlbarEvents();
diff --git a/src/widgets/imageslider/js/jquery.mobile.tizen.imageslider.js b/src/widgets/imageslider/js/jquery.mobile.tizen.imageslider.js
index 757d0604..b35f8bab 100755
--- a/src/widgets/imageslider/js/jquery.mobile.tizen.imageslider.js
+++ b/src/widgets/imageslider/js/jquery.mobile.tizen.imageslider.js
@@ -219,7 +219,6 @@
 		_move: function ( _x ) {
 			var delta = this.org_x - _x,
 				flip = 0,
-				date,
 				drag_time,
 				sec,
 				self;
@@ -235,8 +234,7 @@
 			}
 
 			if ( !flip ) {
-				date = new Date();
-				drag_time = date.getTime() - this.org_time;
+				drag_time = Date.now() - this.org_time;
 
 				if ( Math.abs( delta ) / drag_time > 1 ) {
 					flip = 1;
@@ -326,8 +324,7 @@
 
 				self.org_x = e.pageX;
 
-				date = new Date();
-				self.org_time = date.getTime();
+				self.org_time = Date.now();
 			} );
 
 			this.container.bind( 'vmouseup', function ( e ) {
diff --git a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
index baf88d1b..502554de 100755
--- a/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
+++ b/src/widgets/pagelayout/js/jquery.mobile.tizen.pagelayout.js
@@ -246,17 +246,17 @@
 
 					/* Groupcontrol cannot initialize inline property at first page */
 				$elFooterGroup.addClass( "ui-footer-extended-controlgroup-" + gLength + "btn" );
-
-				footerButton = $elFooter.children( "a" );
-				footerButton.each( function ( i ) {
-					if ( footerButton.eq( i ).is(".ui-btn") && !footerButton.eq( i ).is(".ui-btn-back") ) {
-						footerButton.eq( i )
-							.removeClass( "ui-btn-left" )
-							.addClass( "ui-btn-footer-right" );
-					}
-				});
 			}
 
+			footerButton = $elFooter.children( "a" );
+			footerButton.each( function ( i ) {
+				if ( footerButton.eq( i ).is(".ui-btn") && !footerButton.eq( i ).is(".ui-btn-back") ) {
+					footerButton.eq( i )
+						.removeClass( "ui-btn-left" )
+						.addClass( "ui-btn-footer-right" );
+				}
+			});
+
 			if ( $elFooter.is(".ui-footer-fixed") ) {
 				$elFooter.css( "bottom", 0 );
 			}
@@ -304,11 +304,13 @@
 
 				.bind( "pageshow", function ( event ) {
 					self.updatePagePadding();			// FIXME: unused function.
+					self._updateHeaderArea();
 					if ( o.updatePagePadding ) {
 						$( window ).bind( "throttledresize." + self.widgetName, function () {
 							self.updatePagePadding();	// FIXME: unused function.
 							self.layoutPageIME();   // IME/resize reposition
 							self.updatePageLayout();
+							self._updateHeaderArea();
 						});
 					}
 
@@ -357,6 +359,16 @@
 				});
 		},
 
+		_updateHeaderArea : function() {
+			var $elPage = $( ".ui-page-active" ),
+				$elHeader = $elPage.find( ":jqmData(role='header')" ).length ? $elPage.find( ":jqmData(role='header')") : $elPage.siblings( ":jqmData(role='header')"),
+				headerBtnNum = $elHeader.children("a").length,
+				headerSrcNum = $elHeader.children("img").length;
+
+			$elHeader.find( "h1" ).css( "width", window.innerWidth - $elHeader.children( "a" ).width() * headerBtnNum - $elHeader.children( "a" ).width() / 4 - $elHeader.children( "img" ).width() * headerSrcNum * 3 );
+			/* add half width for default space between text and button, and img tag area is too narrow, so multiply three for img width*/
+		},
+
 		_visible: true,
 		_IMEShown : false,
 		_IMEindicatorHeight : window.outerHeight - window.innerHeight,
diff --git a/src/widgets/slider/js/jquery.mobile.tizen.slider.js b/src/widgets/slider/js/jquery.mobile.tizen.slider.js
index 6290fe45..c022a4d7 100755
--- a/src/widgets/slider/js/jquery.mobile.tizen.slider.js
+++ b/src/widgets/slider/js/jquery.mobile.tizen.slider.js
@@ -106,7 +106,7 @@
 			// set the popup according to the html attribute
 			popupEnabledAttr = inputElement.jqmData('popup');
 			if ( popupEnabledAttr !== undefined ) {
-				self.options.popup = ( popupEnabledAttr === 'true' );
+				self.options.popup = ( popupEnabledAttr == true );
 			}
 
 			// get the actual slider added by jqm
diff --git a/src/widgets/virtualgrid/js/jquery.mobile.tizen.virtualgrid.js b/src/widgets/virtualgrid/js/jquery.mobile.tizen.virtualgrid.js
index 990bbe92..bdcfba43 100755
--- a/src/widgets/virtualgrid/js/jquery.mobile.tizen.virtualgrid.js
+++ b/src/widgets/virtualgrid/js/jquery.mobile.tizen.virtualgrid.js
@@ -121,7 +121,7 @@
 	};
 
 	function getCurrentTime () {
-		return (new Date()).getTime();
+		return Date.now();
 	}
 
 	$.extend (MomentumTracker.prototype, {