From 939da8834e5c3cc53ff80ebe894502f4e2d6a193 Mon Sep 17 00:00:00 2001
From: Rebecca Murphey <rmurphey@gmail.com>
Date: Sun, 17 Jun 2012 18:45:00 -0400
Subject: [PATCH] have notes page only listen to one socket

---
 slidenotes/index.js   | 13 ++++++++++---
 slidenotes/notes.html | 24 ++++++++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/slidenotes/index.js b/slidenotes/index.js
index fb6baf85..d27847e8 100644
--- a/slidenotes/index.js
+++ b/slidenotes/index.js
@@ -2,6 +2,7 @@ var express   = require('express');
 var fs        = require('fs');
 var io        = require('socket.io');
 var _         = require('underscore');
+var Mustache  = require('mustache');
 
 var app       = express.createServer();
 var staticDir = express.static;
@@ -29,8 +30,14 @@ app.get("/", function(req, res) {
   fs.createReadStream(opts.baseDir + '/index.html').pipe(res);
 });
 
-app.get("/_notes", function(req, res) {
-  fs.createReadStream(opts.baseDir + 'slidenotes/notes.html').pipe(res);
+app.get("/_notes/:socketId", function(req, res) {
+
+  fs.readFile(opts.baseDir + 'slidenotes/notes.html', function(err, data) {
+    res.send(Mustache.to_html(data.toString(), {
+      socketId : req.params.socketId
+    }));
+  });
+  // fs.createReadStream(opts.baseDir + 'slidenotes/notes.html').pipe(res);
 });
 
 // Actually listen
@@ -38,4 +45,4 @@ app.listen(opts.port || null);
 
 console.log("Your slides are at http://localhost" + (opts.port ? (':' + opts.port) : ''));
 console.log("Your notes are at http://localhost" + (opts.port ? (':' + opts.port) : '') + '/_notes');
-console.log("Advance through your slides and your speaker notes will advance automatically");
\ No newline at end of file
+console.log("Advance through your slides and your speaker notes will advance automatically");
diff --git a/slidenotes/notes.html b/slidenotes/notes.html
index ffcfdcbc..4b952108 100644
--- a/slidenotes/notes.html
+++ b/slidenotes/notes.html
@@ -18,16 +18,16 @@
         float: left;
       }
 
-      #slides { 
-        width: 1280px; 
-        height: 1024px; 
-        border: 1px solid black; 
+      #slides {
+        width: 1280px;
+        height: 1024px;
+        border: 1px solid black;
         -moz-transform: scale(0.5);
         -moz-transform-origin: 0 0;
         -o-transform: scale(0.5);
         -o-transform-origin: 0 0;
         -webkit-transform: scale(0.5);
-        -webkit-transform-origin: 0 0;      
+        -webkit-transform-origin: 0 0;
       }
 
       #wrap-next-slide {
@@ -37,16 +37,16 @@
         margin: 0 0 0 50px;
       }
 
-      #next-slide { 
-        width: 1280px; 
-        height: 1024px; 
-        border: 1px solid black; 
+      #next-slide {
+        width: 1280px;
+        height: 1024px;
+        border: 1px solid black;
         -moz-transform: scale(0.25);
         -moz-transform-origin: 0 0;
         -o-transform: scale(0.25);
         -o-transform-origin: 0 0;
         -webkit-transform: scale(0.25);
-        -webkit-transform-origin: 0 0;      
+        -webkit-transform-origin: 0 0;
       }
     </style>
   </head>
@@ -65,12 +65,16 @@
     <script src="socket.io/socket.io.js"></script>
 
     <script>
+    var socketId = '{{socketId}}';
     var socket = io.connect('http://localhost:1947');
     var notes = document.getElementById('notes');
     var slides = document.getElementById('slides');
     var nextSlide = document.getElementById('next-slide');
 
     socket.on('slidedata', function(data) {
+      // ignore data from sockets that aren't ours
+      if (data.socketId !== socketId) { return; }
+
       notes.innerHTML = data.notes;
       slides.contentWindow.Reveal.navigateTo(data.indexh, data.indexv);
       nextSlide.contentWindow.Reveal.navigateTo(data.nextindexh, data.nextindexv);