Permalink
Browse files

Always call nav.enable() to make nav collapsable (#519)

Always call nav.enable() to make nav collapsing work
  • Loading branch information...
jessetan authored and Blendify committed Dec 20, 2017
1 parent 5de02b5 commit 5db94ebf5f6f06d36fb961a7cee0b53d426214b6
Showing with 33 additions and 22 deletions.
  1. +28 −18 js/theme.js
  2. +5 −4 sphinx_rtd_theme/layout.html
View
@@ -15,17 +15,22 @@ function ThemeNav () {
isRunning: false
};
nav.enable = function () {
nav.enable = function (withStickyNav) {
var self = this;
if (!self.isRunning) {
self.isRunning = true;
jQuery(function ($) {
self.init($);
if (self.isRunning) {
// Only allow enabling nav logic once
return;
}
self.reset();
self.win.on('hashchange', self.reset);
self.isRunning = true;
jQuery(function ($) {
self.init($);
self.reset();
self.win.on('hashchange', self.reset);
if (withStickyNav) {
// Set scroll monitor
self.win.on('scroll', function () {
if (!self.linkScroll) {
@@ -35,18 +40,23 @@ function ThemeNav () {
}
}
});
}
// Set resize monitor
self.win.on('resize', function () {
if (!self.winResize) {
self.winResize = true;
requestAnimationFrame(function() { self.onResize(); });
}
});
self.onResize();
// Set resize monitor
self.win.on('resize', function () {
if (!self.winResize) {
self.winResize = true;
requestAnimationFrame(function() { self.onResize(); });
}
});
};
self.onResize();
});
};
nav.enableSticky = function() {
this.enable(true);
};
nav.init = function ($) {
@@ -176,7 +186,7 @@ function ThemeNav () {
module.exports.ThemeNav = ThemeNav();
if (typeof(window) != 'undefined') {
window.SphinxRtdTheme = { StickyNav: module.exports.ThemeNav };
window.SphinxRtdTheme = { Navigation: module.exports.ThemeNav };
}
@@ -209,14 +209,15 @@
<script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
{% endif %}
{# STICKY NAVIGATION #}
{% if theme_sticky_navigation|tobool %}
<script type="text/javascript">
jQuery(function () {
SphinxRtdTheme.StickyNav.enable();
{% if theme_sticky_navigation|tobool %}
SphinxRtdTheme.Navigation.enableSticky();
{% else %}
SphinxRtdTheme.Navigation.enable();
{% endif %}
});
</script>
{% endif %}
{%- block footer %} {% endblock %}

0 comments on commit 5db94eb

Please sign in to comment.