Skip to content
This repository
Browse code

Merge pull request #4486 from ngharo/master

Prevents scrollbars on pages with custom borders
  • Loading branch information...
commit d2fd2ac19299fdcb4286254caf7969a2b361c3dc 1 parent 93d9377
Jasper de Groot authored June 14, 2012 uGoMobi committed June 15, 2012

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. 6  js/jquery.mobile.navigation.js
6  js/jquery.mobile.navigation.js
@@ -542,9 +542,11 @@ define( [
542 542
 	function resetActivePageHeight(){
543 543
 		var aPage = $( "." + $.mobile.activePageClass ),
544 544
 			aPagePadT = parseFloat( aPage.css( "padding-top" ) ),
545  
-			aPagePadB = parseFloat( aPage.css( "padding-bottom" ) );
  545
+			aPagePadB = parseFloat( aPage.css( "padding-bottom" ) ),
  546
+			aPageBorderT = parseFloat( aPage.css( "border-top-width" ) ),
  547
+			aPageBorderB = parseFloat( aPage.css( "border-bottom-width" ) );
546 548
 
547  
-		aPage.css( "min-height", getScreenHeight() - aPagePadT - aPagePadB );
  549
+		aPage.css( "min-height", getScreenHeight() - aPagePadT - aPagePadB - aPageBorderT - aPageBorderB );
548 550
 	}
549 551
 
550 552
 	//shared page enhancements

0 notes on commit d2fd2ac

Please sign in to comment.
Something went wrong with that request. Please try again.