xobs/fa23-si
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Banham 2012-08-06 11:20:08 +10:00
parent ee12450458
commit a2e021ccdb
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/reveal.js
View File

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

2
plugin/multiplex/client.js
View File

@ -7,6 +7,6 @@
if (data.socketId !== socketId) { return; } if (data.socketId !== socketId) { return; }
if( window.location.host === 'localhost:1947' ) 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
View File

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