From 523989a21c40ff5943cbd3ba1d78b11272fa4a0d Mon Sep 17 00:00:00 2001
From: David Banham
Date: Sun, 10 Mar 2013 14:00:21 +1100
Subject: Remove unessecary file
---
plugin/multiplex/notes.html | 109 --------------------------------------------
1 file changed, 109 deletions(-)
delete mode 100644 plugin/multiplex/notes.html
diff --git a/plugin/multiplex/notes.html b/plugin/multiplex/notes.html
deleted file mode 100644
index 88924c0..0000000
--- a/plugin/multiplex/notes.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
- reveal.js - Slide Notes
-
-
-
-
-
-
-
-
-
-
-
-
- UPCOMING:
-
-
-
-
-
-
-
-
-
--
cgit v1.2.3
From ccaadaad45348cda17da6c11adf301ed3b22ca25 Mon Sep 17 00:00:00 2001
From: David Banham
Date: Mon, 11 Mar 2013 09:15:11 +1100
Subject: Error check to prevent exception from Cipher
---
plugin/multiplex/index.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js
index 0b03fc7..35df8e3 100644
--- a/plugin/multiplex/index.js
+++ b/plugin/multiplex/index.js
@@ -15,6 +15,7 @@ var opts = {
io.sockets.on('connection', function(socket) {
socket.on('slidechanged', function(slideData) {
+ if (typeof slideData.secret == 'undefined' || slideData.secret == null || slideData.secret === '') return;
if (createHash(slideData.secret) === slideData.socketId) {
slideData.secret = null;
socket.broadcast.emit(slideData.socketId, slideData);
--
cgit v1.2.3
From b8556751bfe40d0d34d0238119a89e7bcc1805bd Mon Sep 17 00:00:00 2001
From: David Banham
Date: Fri, 15 Mar 2013 09:50:11 +1100
Subject: Load socket.io client lib from CDN
Based on user feedback, it was very non-obvious that if using an
web server other than multiplex/index.js it would be necessary to
upload the socket.io client libs. This negates that problem.
---
README.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 19b8172..c7c2b3f 100644
--- a/README.md
+++ b/README.md
@@ -416,17 +416,16 @@ Reveal.initialize({
},
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/master.js', async: true },
]
});
```
-```multiplex.secret``` should only be configured on those pages you wish to be able to control slide navigatoin 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.
+```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 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
--
cgit v1.2.3