summaryrefslogtreecommitdiffstats
path: root/theme/javascript/core/navigation.js
diff options
context:
space:
mode:
authorAaron O'Mullan <aaron.omullan@gmail.com>2014-08-19 16:09:47 -0700
committerAaron O'Mullan <aaron.omullan@gmail.com>2014-08-19 16:09:47 -0700
commit71aff100921f7fcf94c9d75e0bd17c4fcb4669b6 (patch)
treecfefdd61394268bd6f4255eff7414c8a03460c3a /theme/javascript/core/navigation.js
parentf77404afe180e97692897237dca7598eae33a761 (diff)
parent4b390667e574ab46842821f029f3941d797a8b1a (diff)
downloadgitbook-71aff100921f7fcf94c9d75e0bd17c4fcb4669b6.zip
gitbook-71aff100921f7fcf94c9d75e0bd17c4fcb4669b6.tar.gz
gitbook-71aff100921f7fcf94c9d75e0bd17c4fcb4669b6.tar.bz2
Merge pull request #413 from GitbookIO/feature/glossary
Glossary terms highlight in page
Diffstat (limited to 'theme/javascript/core/navigation.js')
-rwxr-xr-xtheme/javascript/core/navigation.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/theme/javascript/core/navigation.js b/theme/javascript/core/navigation.js
index 3749419..f5d03df 100755
--- a/theme/javascript/core/navigation.js
+++ b/theme/javascript/core/navigation.js
@@ -5,8 +5,9 @@ define([
"core/state",
"core/progress",
"core/loading",
- "core/search"
-], function($, URL, events, state, progress, loading, search) {
+ "core/search",
+ "core/glossary"
+], function($, URL, events, state, progress, loading, search, glossary) {
var prev, next;
var usePushState = (typeof history.pushState !== "undefined");
@@ -80,13 +81,16 @@ define([
// Update navigation position
updateNavigationPosition();
+ // Set glossary items
+ glossary.prepare();
+
// Reset scroll
$pageWrapper.scrollTop(0);
// Focus on content
$pageWrapper.focus();
- // Send to mixpanel
+ // Notify
events.trigger("page.change");
};