Permalink
Browse files

Attempt to curb race condition in #939

The full height of the navigation should never be needed, so we'll use
the already calculated combined navigation row height.
  • Loading branch information...
kabel committed Feb 3, 2016
1 parent 64ac095 commit a1b58b5335caea237299e29e4f68d70718385aa9
Showing with 2 additions and 3 deletions.
  1. +2 −3 wdn/templates_4.1/scripts/navigation.js
@@ -300,15 +300,14 @@ define(['jquery', 'wdn', 'modernizr', 'require'], function($, WDN, Modernizr, re
});
};
- var navHeight = $nav.outerHeight();
if (currentState === 0) {
$nav.on(expandEvent, recalcSecondaryHeight);
} else {
recalcSecondaryHeight();
- navHeight += ahAll - $nav.height();
}
+
if (shiftContent) {
- $cWrapper.css(cssPaddingTop, navHeight);
+ $cWrapper.css(cssPaddingTop, ahAll);
}
// look for no secondary links

0 comments on commit a1b58b5

Please sign in to comment.