diff options
Diffstat (limited to 'slidenotes/notes.html')
-rw-r--r-- | slidenotes/notes.html | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/slidenotes/notes.html b/slidenotes/notes.html index ffcfdcb..4b95210 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); |