aboutsummaryrefslogtreecommitdiff
path: root/index.html
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2013-03-08 18:49:28 -0500
committerHakim El Hattab <hakim.elhattab@gmail.com>2013-03-08 18:49:28 -0500
commit2bd5e8b65b5e015c7c7ceffeff845e41811007ed (patch)
tree93cd402c11465003c2b669f0ac2a8162337e649f /index.html
parent16f9749db5f1e3294b574fd0acddf52280c4bb1d (diff)
parent4963f15ab31406cf1ee53dc4d116eb8f630f2b1a (diff)
downloadfosdem-2018-presentation-2bd5e8b65b5e015c7c7ceffeff845e41811007ed.tar
fosdem-2018-presentation-2bd5e8b65b5e015c7c7ceffeff845e41811007ed.tar.gz
merge in multiplex (#98)
Diffstat (limited to 'index.html')
-rw-r--r--index.html13
1 files changed, 12 insertions, 1 deletions
diff --git a/index.html b/index.html
index bc2f360..9c25caa 100644
--- a/index.html
+++ b/index.html
@@ -358,6 +358,14 @@ 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'
+ }
+ },
// Optional libraries used to extend on reveal.js
dependencies: [
@@ -366,8 +374,11 @@ function linkify( selector ) {
{ src: 'plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
+ // { src: 'plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } },
+ // { src: 'socket.io/socket.io.js', async: true, condition: function() { return !!document.body.classList; } },
+ // { src: 'plugin/multiplex/client.js', async: true, condition: function() { return !!document.body.classList; } },
+ // { src: 'plugin/multiplex/master.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } }
- // { src: 'plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
]
});