diff options
| author | Stuart Rackham <srackham@methods.co.nz> | 2011-04-22 22:24:11 +1200 |
|---|---|---|
| committer | Stuart Rackham <srackham@methods.co.nz> | 2011-04-22 22:24:11 +1200 |
| commit | 2c78d5ca0db3e9319f1341ef5b44264bde1b1318 (patch) | |
| tree | d23cc6551333333129680e40b7140565ce7dc6a5 | |
| parent | 4e1c18ea59c8d13e0e870ff93c19f04e62af7eb4 (diff) | |
| download | asciidoc-2c78d5ca0db3e9319f1341ef5b44264bde1b1318.tar.gz | |
Changed order of JavaScript loading to ensure latency patch works with linked
JavaScript. See: http://groups.google.com/group/asciidoc/browse_thread/thread/5a7fe64fbfd65ad
| -rw-r--r-- | examples/website/layout1.conf | 4 | ||||
| -rw-r--r-- | examples/website/layout2.conf | 4 | ||||
| -rw-r--r-- | html5.conf | 2 | ||||
| -rw-r--r-- | xhtml11.conf | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/examples/website/layout1.conf b/examples/website/layout1.conf index 369f34d..5d8c066 100644 --- a/examples/website/layout1.conf +++ b/examples/website/layout1.conf @@ -46,12 +46,12 @@ ifdef::quirks[] <link rel="stylesheet" href="{stylesdir=.}/{theme={backend}}-quirks.css" type="text/css" /> endif::quirks[] <link rel="stylesheet" href="{stylesdir=.}/layout1.css" type="text/css" /> +<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> <script type="text/javascript"> /*<![CDATA[*/ -window.onload = function()\{asciidoc.footnotes();{toc? asciidoc.toc({toclevels});}\} +asciidoc.install({toc?{toclevels}}); /*]]>*/ </script> -<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> ifdef::asciimath[] <script type="text/javascript" src="{scriptsdir=.}/ASCIIMathML.js"></script> endif::asciimath[] diff --git a/examples/website/layout2.conf b/examples/website/layout2.conf index 9212f95..b1b04d4 100644 --- a/examples/website/layout2.conf +++ b/examples/website/layout2.conf @@ -44,12 +44,12 @@ ifdef::quirks[] endif::quirks[] <link rel="stylesheet" href="{stylesdir=.}/layout2.css" type="text/css" /> ifdef::toc[] +<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> <script type="text/javascript"> /*<![CDATA[*/ -window.onload = function()\{generateToc({toclevels=2})\} +asciidoc.install({toc?{toclevels}}); /*]]>*/ </script> -<script type="text/javascript" src="{scriptsdir=.}/toc.js"></script> endif::toc[] ifdef::asciimath[] <script type="text/javascript" src="{scriptsdir=.}/ASCIIMathML.js"></script> @@ -540,6 +540,7 @@ endif::pygments[] endif::linkcss[] ifndef::disable-javascript[] ifdef::linkcss[] +<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> <script type="text/javascript"> #TODO: Escape not necessary in HTML5? # Escape as CDATA to pass validators. @@ -547,7 +548,6 @@ ifdef::linkcss[] asciidoc.install({toc?{toclevels}}); /*]]>*/ </script> -<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> endif::linkcss[] ifndef::linkcss[] <script type="text/javascript"> diff --git a/xhtml11.conf b/xhtml11.conf index 3c9c6aa..61c23cc 100644 --- a/xhtml11.conf +++ b/xhtml11.conf @@ -555,13 +555,13 @@ endif::pygments[] endif::linkcss[] ifndef::disable-javascript[] ifdef::linkcss[] +<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> <script type="text/javascript"> # Escape as CDATA to pass validators. /*<![CDATA[*/ asciidoc.install({toc?{toclevels}}); /*]]>*/ </script> -<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script> endif::linkcss[] ifndef::linkcss[] <script type="text/javascript"> |