Merge pull request #2627 from quilicicf/dev_importBundledPlugins

Add bundler-friendly dependency injection
This commit is contained in:
Hakim El Hattab 2020-03-10 10:04:26 +01:00 committed by GitHub
commit 98a6d1de6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 12 deletions

View File

@ -522,6 +522,13 @@ You can add your own extensions using the same syntax. The following properties
- **callback**: [optional] Function to execute when the script has loaded - **callback**: [optional] Function to execute when the script has loaded
- **condition**: [optional] Function which must return true for the script to be loaded - **condition**: [optional] Function which must return true for the script to be loaded
You can additionally use the following syntax, in case you are using a bundler:
- **id**: the id of the plugin to load
- **plugin**: the plugin object to load. It is the plugin implementation that can contain an `init` function
- **async**: [optional] Flags if the script should load after reveal.js has started, defaults to false
- **callback**: [optional] Function to execute when the script has loaded
- **condition**: [optional] Function which must return true for the script to be loaded
### Ready Event ### Ready Event
A `ready` event is fired when reveal.js has loaded all non-async dependencies and is ready to start navigating. To check if reveal.js is already 'ready' you can call `Reveal.isReady()`. A `ready` event is fired when reveal.js has loaded all non-async dependencies and is ready to start navigating. To check if reveal.js is already 'ready' you can call `Reveal.isReady()`.

View File

@ -48,17 +48,22 @@ export default class Plugins {
if( scripts.length ) { if( scripts.length ) {
scriptsToLoad = scripts.length; scriptsToLoad = scripts.length;
const scriptLoadedCallback = (s) => {
if( typeof s.callback === 'function' ) s.callback();
if( --scriptsToLoad === 0 ) {
this.initPlugins().then( resolve );
}
};
// Load synchronous scripts // Load synchronous scripts
scripts.forEach( s => { scripts.forEach( s => {
loadScript( s.src, () => { if (s.id) {
this.registerPlugin(s.id, s.plugin);
if( typeof s.callback === 'function' ) s.callback(); scriptLoadedCallback(s);
} else {
if( --scriptsToLoad === 0 ) { loadScript( s.src, () => scriptLoadedCallback(s));
this.initPlugins().then( resolve ); }
}
} );
} ); } );
} }
else { else {
@ -129,7 +134,13 @@ export default class Plugins {
if( this.asyncDependencies.length ) { if( this.asyncDependencies.length ) {
this.asyncDependencies.forEach( s => { this.asyncDependencies.forEach( s => {
loadScript( s.src, s.callback ); if (s.id) {
this.registerPlugin(s.id, s.plugin);
if (typeof s.plugin.init === 'function') { s.plugin.init(); }
if (typeof s.callback === 'function') { s.callback(); }
} else {
loadScript( s.src, s.callback );
}
} ); } );
} }
@ -190,4 +201,4 @@ export default class Plugins {
} }
} }

View File

@ -4238,4 +4238,4 @@ export default function( revealElement, options ) {
} ); } );
}; };