Merge pull request #131 from Sinetheta/master

theme swap relative to theme file

1 files changed, 8 insertions, 5 deletions

diff --git a/js/reveal.js b/js/reveal.js
index 593c32d..1943e15 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -1,5 +1,5 @@
 /*!
- * reveal.js 2.0 r21
+ * reveal.js 2.0 r22
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  * 
@@ -228,12 +228,16 @@ var Reveal = (function(){
 
 		// Load the theme in the config, if it's not already loaded
 		if( config.theme && dom.theme ) {
-			var themeURL = 'css/theme/' + config.theme + '.css';
-			if( dom.theme.getAttribute( 'href' ) !== themeURL ) {
+			var themeURL = dom.theme.getAttribute( 'href' );
+			var themeFinder = /[^/]*?(?=\.css)/;
+			var themeName = themeURL.match(themeFinder)[0];
+			if(  config.theme !== themeName ) {
+				themeURL = themeURL.replace(themeFinder, config.theme);
 				dom.theme.setAttribute( 'href', themeURL );
 			}
 		}
 
+
 		if( config.transition !== 'default' ) {
 			dom.wrapper.classList.add( config.transition );
 		}
@@ -1142,5 +1146,4 @@ var Reveal = (function(){
 		}
 	};
 	
-})();
-
+})();
\ No newline at end of file