Merge branch 'master' of github.com:hakimel/reveal.js

This commit is contained in:
Hakim El Hattab 2012-08-04 10:52:34 -04:00
commit 20b77b5419
1 changed files with 3 additions and 3 deletions

View File

@ -322,6 +322,8 @@ function linkify( selector ) {
scripts.push( 'lib/js/data-markdown.js' ); scripts.push( 'lib/js/data-markdown.js' );
} }
scripts.push( 'js/reveal.js' );
// If we're runnning the notes server we need to include some additional JS // If we're runnning the notes server we need to include some additional JS
// TODO Is there a better way to determine if we're running the notes server? // TODO Is there a better way to determine if we're running the notes server?
if( window.location.host === 'localhost:1947' ) { if( window.location.host === 'localhost:1947' ) {
@ -329,12 +331,10 @@ function linkify( selector ) {
scripts.push( 'plugin/speakernotes/client.js' ); scripts.push( 'plugin/speakernotes/client.js' );
} }
scripts.push( 'js/reveal.js' );
// Load the scripts and, when completed, initialize reveal.js // Load the scripts and, when completed, initialize reveal.js
head.js.apply( null, scripts ); head.js.apply( null, scripts );
</script> </script>
</body> </body>
</html> </html>