openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am bcdbb68a: am ed02b7fb: am 8b2be3d8: am f525781e: fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible 

* commit 'bcdbb68a9b0466136af0b4c9d5b46d4b6343cc2d':
  fix regression with horizontal scroll so the sidenav moves with the rest of the content when the sticky bar is visible
This commit is contained in:
Scott Main 2014-05-23 22:05:38 +00:00 committed by Android Git Automerger
parent 1dc4f0bace bcdbb68a9b
commit 8c980422e3
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/droiddoc/templates-sdk/assets/js/docs.js
View File

@ -19,7 +19,6 @@ $.ajaxSetup({
/****** ON LOAD SET UP STUFF *********/
var navBarIsFixed = false;
$(document).ready(function() {
// load json file for JD doc search suggestions
@ -411,7 +410,7 @@ false; // navigate across topic boundaries only in design docs
var stylesheet = $('link[rel="stylesheet"][class="fullscreen"]');
setNavBarLeftPos(); // do this even if sidenav isn't fixed because it could become fixed
// make sidenav behave when resizing the window and side-scolling is a concern
if (navBarIsFixed) {
if (sticky) {
if ((stylesheet.attr("disabled") == "disabled") || stylesheet.length == 0) {
updateSideNavPosition();
} else {
@ -931,19 +930,19 @@ $(window).scroll(function(event) {
if ($("#doc-col").height() < $("#side-nav").height()) {
shouldBeSticky = false;
}
// Account for horizontal scroll
var scrollLeft = $(window).scrollLeft();
// When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match
if (sticky && (scrollLeft != prevScrollLeft)) {
updateSideNavPosition();
prevScrollLeft = scrollLeft;
}
// Don't continue if the header is sufficently far away
// (to avoid intensive resizing that slows scrolling)
if (sticky == shouldBeSticky) {
return;
}
// Account for horizontal scroll
var scrollLeft = $(window).scrollLeft();
// When the sidenav is fixed and user scrolls horizontally, reposition the sidenav to match
if (navBarIsFixed && (scrollLeft != prevScrollLeft)) {
updateSideNavPosition();
prevScrollLeft = scrollLeft;
}
// If sticky header visible and position is now near top, hide sticky
if (sticky && !shouldBeSticky) {
@ -2655,7 +2654,7 @@ var maxLevel = 1;
}
function updateSidenavFixedWidth() {
if (!navBarIsFixed) return;
if (!sticky) return;
$('#devdoc-nav').css({
'width' : $('#side-nav').css('width'),
'margin' : $('#side-nav').css('margin')
@ -2666,7 +2665,7 @@ function updateSidenavFixedWidth() {
}
function updateSidenavFullscreenWidth() {
if (!navBarIsFixed) return;
if (!sticky) return;
$('#devdoc-nav').css({
'width' : $('#side-nav').css('width'),
'margin' : $('#side-nav').css('margin')