Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f525781e authored by Scott Main's avatar Scott Main
Browse files

fix regression with horizontal scroll so the sidenav moves 

with the rest of the content when the sticky bar is visible

Change-Id: I6c310405c15a8f74719b895f14eb5f4780277845
parent e7d75351

tools/droiddoc/templates-sdk/assets/js/docs.js

+10 −11
Original line number Diff line number Diff line
@@ -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,20 +930,20 @@ $(window).scroll(function(event) { 
  if ($("#doc-col").height() < $("#side-nav").height()) {

    shouldBeSticky = false;

  }



  // 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)) {

  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;

  }



  // If sticky header visible and position is now near top, hide sticky

  if (sticky && !shouldBeSticky) {

    sticky = false;
@@ -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')