Skip to content

Commit de74d98

Browse files
author
Javier de Silóniz Sandino
authored
Merge pull request scala#30 from 47deg/sl29-sidebar-toc-generator
Integration of sidebar toc generator script
2 parents f45f4d9 + 92cc245 commit de74d98

File tree

5 files changed

+21
-34
lines changed

5 files changed

+21
-34
lines changed

_includes/footer.html

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,48 +31,20 @@
3131
<!-- unslider js -->
3232
<script src="{{ site.baseurl }}/resources/js/vendor/unslider.js" type="text/javascript" ></script>
3333

34-
{% unless page.layout == 'page-no-toc' %}
35-
<!-- table of contents JS
36-
<script src="{{ site.baseurl }}/resources/js/vendor/toc.js" type="text/javascript" ></script>
37-
<script type="text/javascript">
38-
$(document).ready(function(){
39-
$('#toc').toc({exclude: 'h1, h5, h6', context: '', autoId: true, numerate: false});
40-
function moveScroller() {
41-
if ($(".sidebar").length == 0)
42-
return;
43-
var a = function() {
44-
var topOfScroll = $(window).scrollTop();
45-
var topOfSidebar = $(".sidebar").offset().top;
46-
var sidebarInner = $(".sidebar-inner");
47-
var bottomOfSidebarInner = $(".sidebar-inner").offset().top + $(".sidebar-inner").outerHeight();
48-
var topOfFooter = $(".footer").offset().top - 10;
49-
var footerHeight = $(".footer").outerHeight();
50-
if (topOfScroll > topOfSidebar) {
51-
if (bottomOfSidebarInner > topOfFooter) {
52-
sidebarInner.css({position:"fixed",bottom:footerHeight,top:""});
53-
} else {
54-
sidebarInner.css({position:"fixed",top:"10px",bottom:""});
55-
}
56-
} else {
57-
sidebarInner.css({position:"relative",top:""});
58-
}
59-
};
60-
$(window).scroll(a);a()
61-
}
62-
moveScroller();
63-
})
64-
</script>
65-
{% endunless %}
66-
6734
<!-- Highlight -->
6835
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" type="text/javascript"></script>
6936
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/scala.min.js" type="text/javascript"></script>
7037
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/java.min.js" type="text/javascript"></script>
71-
38+
7239
<!-- CodeMirror -->
7340
<script src="{{ site.baseurl }}/resources/js/vendor/codemirror/codemirror.js" type="text/javascript"></script>
7441
<script src="{{ site.baseurl }}/resources/js/vendor/codemirror/clike.js" type="text/javascript"></script>
7542

43+
<!-- TOC -->
44+
{% if page.includeTOC == true %}
45+
<script src="/resources/js/vendor/toc.js" type="text/javascript" ></script>
46+
{% endif %}
47+
7648
<!-- Custom javascript -->
7749
<script src="{{ site.baseurl }}/resources/js/functions.js" type="text/javascript"></script>
7850
</body>

_includes/sidebar-toc.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div id="sidebar-toc">
2+
3+
</div>

_layouts/default.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ <h1 id="page-title">{{ page.title }}</h1>
2828
</div>
2929
</div>
3030

31+
{% if page.includeTOC == true %}
32+
{% include sidebar-toc.html %}
33+
{% endif %}
34+
3135
{% include footer.html %}

documentation/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
layout: page
33
title: Documentation
4+
includeTOC: true
45
---
56

67
<div class="container">

resources/js/functions.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ $('#scaladex-search').autocomplete({
174174
window.open(suggestion.data, '_blank');
175175
}
176176
}
177+
177178
});
178179

179180
// Scala in the browser
@@ -202,3 +203,9 @@ $(document).ready(function() {
202203
}, 2000);
203204
})
204205
});
206+
207+
// TOC:
208+
209+
$(document).ready(function(){
210+
$('#sidebar-toc').toc({exclude: 'h1, h5, h6', context: '', autoId: true, numerate: false});
211+
})

0 commit comments

Comments
 (0)