Fix for glossary

This commit is contained in:
John Mulhausen 2017-04-21 14:31:23 -07:00
parent 7b7cf3e229
commit a36d37dae6
3 changed files with 51 additions and 45 deletions

View File

@ -217,6 +217,18 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
<script src="/js/bootstrap.min.js"></script> <script src="/js/bootstrap.min.js"></script>
<script src="/js/stickyfill.min.js"></script> <script src="/js/stickyfill.min.js"></script>
<script defer src="/js/docs.js"></script> <script defer src="/js/docs.js"></script>
<script language="javascript">
jQuery(document).ready(function(){
$.getJSON( "/metadata.txt", function( data ) {
metadata = data;
hookupTOCEvents();
$.getJSON( "/glossary.txt", function( data ) {
glossary = data;
renderTagsPage();
});
});
});
</script>
</body> </body>
</html> </html>

View File

@ -16,6 +16,8 @@ if (current[0]) {
function highlightRightNav(heading) function highlightRightNav(heading)
{ {
if (document.location.pathname.indexOf("/glossary/")<0){
console.log("highlightRightNav called on",document.location.pathname)
if (heading == "title") if (heading == "title")
{ {
history.replaceState({},"Top of page on " + document.location.pathname,document.location.protocol +"//"+ document.location.hostname + (location.port ? ':'+location.port: '') + document.location.pathname); history.replaceState({},"Top of page on " + document.location.pathname,document.location.protocol +"//"+ document.location.hostname + (location.port ? ':'+location.port: '') + document.location.pathname);
@ -54,6 +56,7 @@ function highlightRightNav(heading)
}); });
} }
} }
}
} }
var currentHeading = ""; var currentHeading = "";
$(window).scroll(function(){ $(window).scroll(function(){

View File

@ -261,18 +261,9 @@ function renderTagsPage()
var glossaryOutput = glossary.terms[i].def; var glossaryOutput = glossary.terms[i].def;
} }
} }
if (glossaryOutput) $("#glossaryMatch").html("<h2>Definition of: " + tagToLookup + "</h2>" + glossaryOutput); if (glossaryOutput) {
$("#glossaryMatch").html("<h2>Definition of: " + tagToLookup + "</h2>" + glossaryOutput);
}
renderTopicsByTagTable(tagToLookup,"topicMatch",true); renderTopicsByTagTable(tagToLookup,"topicMatch",true);
} }
} }
jQuery(document).ready(function(){
$.getJSON( "/metadata.txt", function( data ) {
metadata = data;
hookupTOCEvents();
$.getJSON( "/glossary.txt", function( data ) {
glossary = data;
renderTagsPage();
});
});
});