Browse Source

Don't suppress the whole event, just add context metadata

embed
David Banham 12 years ago
parent
commit
a2e021ccdb
  1. 9
      js/reveal.js
  2. 2
      plugin/multiplex/client.js
  3. 2
      plugin/multiplex/master.js

9
js/reveal.js

@ -653,7 +653,7 @@ var Reveal = (function(){
* Updates the visual slides to represent the currently
* set indices.
*/
function slide( h, v, fireEvent ) {
function slide( h, v, origin ) {
// Remember where we were at before
previousSlide = currentSlide;
@ -720,15 +720,14 @@ var Reveal = (function(){
// Dispatch an event if the slide changed
if( indexh !== indexhBefore || indexv !== indexvBefore ) {
if( fireEvent !== false ) {
dispatchEvent( 'slidechanged', {
'origin': origin,
'indexh': indexh,
'indexv': indexv,
'previousSlide': previousSlide,
'currentSlide': currentSlide
} );
}
}
else {
// Ensure that the previous slide is never the same as the current
previousSlide = null;
@ -903,8 +902,8 @@ var Reveal = (function(){
* @param {Number} h The horizontal index of the slide to show
* @param {Number} v The vertical index of the slide to show
*/
function navigateTo( h, v, fireEvent ) {
slide( h, v, fireEvent );
function navigateTo( h, v, origin ) {
slide( h, v, origin );
}
function navigateLeft() {

2
plugin/multiplex/client.js

@ -7,6 +7,6 @@
if (data.socketId !== socketId) { return; }
if( window.location.host === 'localhost:1947' ) return;
Reveal.navigateTo(data.indexh, data.indexv, false);
Reveal.navigateTo(data.indexh, data.indexv, 'remote');
});
}());

2
plugin/multiplex/master.js

@ -27,6 +27,6 @@
socketId : multiplex.id
};
socket.emit('slidechanged', slideData);
if( event.origin !== 'remote') socket.emit('slidechanged', slideData);
} );
}());

Loading…
Cancel
Save