Commit 825fe51d authored by Hakim El Hattab's avatar Hakim El Hattab
Browse files

add Reveal.getConfig(), replace use of window.globals (#98)

parent 2bd5e8b6
......@@ -358,13 +358,12 @@ function linkify( selector ) {
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/fade/none
globals: {
// Generate a unique id and secret at http://revealjs.jit.su/token
multiplex: {
id: '7d10234555b923e2',
secret: '13627859051503309760',
url: 'revealjs.jit.su:80'
}
// Generate a unique id and secret at http://revealjs.jit.su/token
multiplex: {
id: '',
secret: '',
url: 'revealjs.jit.su:80'
},
// Optional libraries used to extend on reveal.js
......
......@@ -160,9 +160,6 @@ 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();
......@@ -2031,6 +2028,11 @@ var Reveal = (function(){
return scale;
},
// Returns the current configuration object
getConfig: function() {
return config;
},
// Helper method, retrieves query string as a key/value hash
getQueryHash: function() {
var query = {};
......
This diff is collapsed.
(function() {
var multiplex = window.globals.multiplex;
var multiplex = Reveal.getConfig().multiplex;
var socketId = multiplex.id;
var socket = io.connect(multiplex.url);
......
(function() {
// don't emit events from inside the previews themselves
if ( window.location.search.match( /receiver/gi ) ) { return; }
var multiplex = window.globals.multiplex;
var multiplex = Reveal.getConfig().multiplex;
var socket = io.connect(multiplex.url);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment