merge conflict
This commit is contained in:
commit
5ba8440dca
@ -416,16 +416,16 @@ Reveal.initialize({
|
|||||||
},
|
},
|
||||||
|
|
||||||
dependencies: [
|
dependencies: [
|
||||||
{ src: 'socket.io/socket.io.js', async: true },
|
{ src: '//cdnjs.cloudflare.com/ajax/libs/socket.io/0.9.10/socket.io.min.js', async: true },
|
||||||
{ src: 'plugin/multiplex/client.js', async: true },
|
{ src: 'plugin/multiplex/client.js', async: true },
|
||||||
{ src: 'plugin/multiplex/master.js', async: true },
|
{ src: 'plugin/multiplex/master.js', async: true },
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigation for all clients. Multi-master configurations work, but if you don't want your audience to be able to control your slides, set the secret to ``null``. In this master/slave setup, you should create a publicly accessible page with secret set to ``null``, and a protected page containing your secret.
|
```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigation for all clients. Multi-master configurations work, but if you don't wish your audience to be able to control your slides, set the secret to ``null``. In this master/slave setup, you should create a publicly accessible page with secret set to ``null``, and a protected page containing your secret.
|
||||||
|
|
||||||
You are very welcome to use the server running at reveal.jit.su, however availability and stability are not guaranteed. For anything mission critical I recommend you run your own server. It is simple to deploy to nodejitsu or run on your own environment.
|
You are very welcome to use the socketio server running at reveal.jit.su, however availability and stability are not guaranteed. For anything mission critical I recommend you run your own server. It is simple to deploy to nodejitsu or run on your own environment.
|
||||||
|
|
||||||
|
|
||||||
## Theming
|
## Theming
|
||||||
|
@ -15,6 +15,7 @@ var opts = {
|
|||||||
|
|
||||||
io.sockets.on('connection', function(socket) {
|
io.sockets.on('connection', function(socket) {
|
||||||
socket.on('slidechanged', function(slideData) {
|
socket.on('slidechanged', function(slideData) {
|
||||||
|
if (typeof slideData.secret == 'undefined' || slideData.secret == null || slideData.secret === '') return;
|
||||||
if (createHash(slideData.secret) === slideData.socketId) {
|
if (createHash(slideData.secret) === slideData.socketId) {
|
||||||
slideData.secret = null;
|
slideData.secret = null;
|
||||||
socket.broadcast.emit(slideData.socketId, slideData);
|
socket.broadcast.emit(slideData.socketId, slideData);
|
||||||
|
Loading…
Reference in New Issue
Block a user