merge in multiplex (#98)

1 files changed, 7 insertions, 2 deletions

diff --git a/js/reveal.js b/js/reveal.js
index 4b56ed1..b767594 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -160,6 +160,9 @@ var Reveal = (function(){
 		// Copy options over to our config object
 		extend( config, options );
 
+		// Push up globals
+		window.globals = config.globals;
+
 		// Hide the address bar in mobile browsers
 		hideAddressBar();
 
@@ -1019,8 +1022,9 @@ var Reveal = (function(){
 	 * @param {int} v Vertical index of the target slide
 	 * @param {int} f Optional index of a fragment within the
 	 * target slide to activate
+	 * @param {int} o Optional origin for use in multimaster environments
 	 */
-	function slide( h, v, f ) {
+	function slide( h, v, f, o ) {
 
 		// Remember where we were at before
 		previousSlide = currentSlide;
@@ -1115,7 +1119,8 @@ var Reveal = (function(){
 				'indexh': indexh,
 				'indexv': indexv,
 				'previousSlide': previousSlide,
-				'currentSlide': currentSlide
+				'currentSlide': currentSlide,
+				'origin': o
 			} );
 		}
 		else {