diff options
author | Jinhyuk Jun <jinhyuk.jun@samsung.com> | 2013-04-26 13:23:12 +0900 |
---|---|---|
committer | Youmin Ha <youmin.ha@samsung.com> | 2013-04-26 14:43:30 +0900 |
commit | 3085ec055300742d334fd5684f83327df4919e22 (patch) | |
tree | 9115a53c4ff7a99850befe82c23bd7acdd41fd80 | |
parent | 4c77334c69b5e642323769adbc703fedc42257a9 (diff) | |
download | web-ui-fw-3085ec055300742d334fd5684f83327df4919e22.tar.gz web-ui-fw-3085ec055300742d334fd5684f83327df4919e22.tar.bz2 web-ui-fw-3085ec055300742d334fd5684f83327df4919e22.zip |
PageLayout : bug fix
change jqmData("scroll") check option in case using data-scroll="none"
Change-Id: Ifdfa1926f629fd1ca0dae510b2cf4414f00a0831
-rw-r--r-- | src/js/widgets/jquery.mobile.tizen.pagelayout.js | 6 |
1 files 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 { |