diff options
| -rw-r--r-- | haddock-api/resources/html/index.js | 14 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Backends/Xhtml.hs | 7 |
2 files changed, 18 insertions, 3 deletions
diff --git a/haddock-api/resources/html/index.js b/haddock-api/resources/html/index.js index 6d5b2bfc..109a106b 100644 --- a/haddock-api/resources/html/index.js +++ b/haddock-api/resources/html/index.js @@ -1,3 +1,7 @@ +quickNav = (function() { + +var baseUrl; + // alias preact's hyperscript reviver since it's referenced a lot: var h = preact.h; @@ -256,7 +260,7 @@ var App = createClass({ var renderItem = function(item) { return h('li', { class: 'search-result' }, - this.navigationLink(item.link, {}, + this.navigationLink(baseUrl + "/" + item.link, {}, h(DocHtml, { html: item.display_html }) ) ); @@ -379,4 +383,10 @@ var NoResultsMsg = function(props) { return messages[(props.searchString || 'a').charCodeAt(0) % messages.length]; }; -preact.render(h(App), document.body); +return { + init: function(docBaseUrl) { + baseUrl = docBaseUrl || ""; + preact.render(h(App), document.body); + } +} +})(); diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs index 80469929..f85ee6b3 100644 --- a/haddock-api/src/Haddock/Backends/Xhtml.hs +++ b/haddock-api/src/Haddock/Backends/Xhtml.hs @@ -194,7 +194,12 @@ bodyHtml doctitle iface script ! [src jsPreactFile, thetype "text/javascript"] << noHtml, script ! [src jsFuseFile, thetype "text/javascript"] << noHtml, - script ! [src jsIndexFile, thetype "text/javascript"] << noHtml + script ! [src jsIndexFile, thetype "text/javascript"] << noHtml, + script ! [thetype "text/javascript"] + -- NB: Within XHTML, the content of script tags needs to be + -- a <![CDATA[ section. + << primHtml + "//<![CDATA[\nquickNav.init();\n//]]>\n" ] moduleInfo :: Interface -> Html |