update syntax highlight after editing (#210), move markdown and highl…

…ight scripts from lib to plugin
czchen · Oct 28, 2012 · e693717 · e693717
1 parent 9da9726
commit e693717
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -356,14 +356,15 @@ <h3>BY Hakim El Hattab / hakim.se</h3>
 
 				// Optional libraries used to extend on reveal.js
 				dependencies: [
-					{ src: 'lib/js/highlight.js', async: true, callback: function() { window.hljs.initHighlightingOnLoad(); } },
 					{ src: 'lib/js/classList.js', condition: function() { return !document.body.classList; } },
-					{ src: 'lib/js/showdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
-					{ src: 'lib/js/data-markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+					{ src: 'plugin/markdown/showdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+					{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
+					{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
 					{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
 					{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
 				]
 			});
+
 		</script>
 
 	</body>

diff --git a/lib/js/highlight.js → plugin/highlight/highlight.js b/lib/js/highlight.js → plugin/highlight/highlight.js
diff --git a/lib/js/data-markdown.js → plugin/markdown/markdown.js b/lib/js/data-markdown.js → plugin/markdown/markdown.js
@@ -2,6 +2,10 @@
 // Modified by Hakim to handle Markdown indented with tabs
 (function(){
 
+    if( typeof Showdown === 'undefined' ) {
+        throw 'The reveal.js Markdown plugin requires Showdown to be loaded';
+    }
+
     var sections = document.querySelectorAll( '[data-markdown]' );
 
     for( var i = 0, len = sections.length; i < len; i++ ) {

diff --git a/lib/js/showdown.js → plugin/markdown/showdown.js b/lib/js/showdown.js → plugin/markdown/showdown.js