Merge pull request #131 from Sinetheta/master
theme swap relative to theme file
This commit is contained in:
commit
c411c4d5d2
11
js/reveal.js
11
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 );
|
||||
}
|
||||
|
@ -1143,4 +1147,3 @@ var Reveal = (function(){
|
|||
};
|
||||
|
||||
})();
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue