From 3085ec055300742d334fd5684f83327df4919e22 Mon Sep 17 00:00:00 2001 From: Jinhyuk Jun Date: Fri, 26 Apr 2013 13:23:12 +0900 Subject: PageLayout : bug fix change jqmData("scroll") check option in case using data-scroll="none" Change-Id: Ifdfa1926f629fd1ca0dae510b2cf4414f00a0831 --- src/js/widgets/jquery.mobile.tizen.pagelayout.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/widgets/jquery.mobile.tizen.pagelayout.js b/src/js/widgets/jquery.mobile.tizen.pagelayout.js index 48d68fc4..c75caf3f 100644 --- a/src/js/widgets/jquery.mobile.tizen.pagelayout.js +++ b/src/js/widgets/jquery.mobile.tizen.pagelayout.js @@ -309,8 +309,8 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { resultMinHeight = layoutInnerHeight - $elHeader.height() - $elFooter.height(); - $elContent.css( "min-height", resultMinHeight - parseFloat( $elContent.css("padding-top") ) - parseFloat( $elContent.css("padding-bottom") ) + "px" ); - if ( $.support.scrollview && $elContent.jqmData("scroll") !== "none" ) { + if ( $.support.scrollview && $elContent.jqmData("scroll") !== "none" ) { + $elContent.css( "min-height", resultMinHeight - parseFloat( $elContent.css("padding-top") ) - parseFloat( $elContent.css("padding-bottom") ) + "px" ); $elContent.children( ".ui-scrollview-view" ).css( "min-height", $elContent.css( "min-height" ) ); } }, @@ -374,7 +374,7 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { $elFooter.css( "bottom", 0 ); } - if ( !$.support.scrollview || ($.support.scrollview && $elContent.jqmData("scroll") !== "none") ) { + if ( !$.support.scrollview || ($.support.scrollview && $elContent.jqmData("scroll") === "none") ) { dpr = window.outerWidth / window.innerWidth; layoutInnerHeight = Math.floor( window.outerHeight / dpr ); } else { -- cgit v1.2.3