Issue #698: Fixed tests

This commit is contained in:
Thomas Endres 2013-11-19 21:10:20 +01:00
parent ffd8ccbffa
commit 08808abf04
1 changed files with 16 additions and 13 deletions

View File

@ -242,6 +242,7 @@ var Reveal = (function(){
} }
/** /**
* Loads the dependencies of reveal.js. Dependencies are * Loads the dependencies of reveal.js. Dependencies are
* defined via the configuration option 'dependencies' * defined via the configuration option 'dependencies'
@ -264,6 +265,20 @@ var Reveal = (function(){
start(); start();
} }
function loadDependency(s) {
head.ready( s.src.match( /([\w\d_\-]*)\.?js$|[^\\\/]*$/i )[0], function() {
// Extension may contain callback functions
if( typeof s.callback === 'function' ) {
s.callback.apply(this);
}
scriptsToApply--;
if (scriptsToApply === 0) {
proceed();
}
});
}
for( var i = 0, len = config.dependencies.length; i < len; i++ ) { for( var i = 0, len = config.dependencies.length; i < len; i++ ) {
var s = config.dependencies[i]; var s = config.dependencies[i];
@ -276,19 +291,7 @@ var Reveal = (function(){
scripts.push( s.src ); scripts.push( s.src );
} }
// Extension may contain callback functions loadDependency(s);
(function(s) {
head.ready( s.src.match( /([\w\d_\-]*)\.?js$|[^\\\/]*$/i )[0], function() {
if( typeof s.callback === 'function' ) {
s.callback.apply(this);
}
scriptsToApply--;
if (scriptsToApply === 0) {
proceed();
}
});
})(s);
} }
} }