diff options
| author | David Banham | 2013-03-08 11:51:58 +1100 |
|---|---|---|
| committer | David Banham | 2013-03-08 12:43:18 +1100 |
| commit | 580a72c4449c57cb743e09f44eeeb374cd00f172 (patch) | |
| tree | 684a7f7920e903f6372e590d606aede0b09fb287 /js/reveal.js | |
| parent | 61c229a4f969a0720085c2710f8a7cfd8a12b4a6 (diff) | |
Bring multiplex up to date
Diffstat (limited to 'js/reveal.js')
| -rw-r--r-- | js/reveal.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/js/reveal.js b/js/reveal.js index 2fa74df..72f68cb 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(); @@ -1002,8 +1005,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; @@ -1098,7 +1102,8 @@ var Reveal = (function(){ 'indexh': indexh, 'indexv': indexv, 'previousSlide': previousSlide, - 'currentSlide': currentSlide + 'currentSlide': currentSlide, + 'origin': o } ); } else { |