Merge pull request #2627 from quilicicf/dev_importBundledPlugins

Add bundler-friendly dependency injection

README.md

@@ -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
 - **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
 
 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()`.

js/controllers/plugins.js

@@ -48,17 +48,22 @@ export default class Plugins {
 			if( 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
 				scripts.forEach( s => {
-					loadScript( s.src, () => {
-
-						if( typeof s.callback === 'function' ) s.callback();
-
-						if( --scriptsToLoad === 0 ) {
-							this.initPlugins().then( resolve );
-						}
-
-					} );
+					if (s.id) {
+						this.registerPlugin(s.id, s.plugin);
+						scriptLoadedCallback(s);
+					} else {
+						loadScript( s.src, () => scriptLoadedCallback(s));
+					}
 				} );
 			}
 			else {
@@ -129,7 +134,13 @@ export default class Plugins {
 
 		if( this.asyncDependencies.length ) {
 			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 {
 
 	}
 
-}
+}

js/reveal.js

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