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

merge notes float fix and support for multiple fragments with same index

Browse Source
This commit is contained in:
Hakim El Hattab 2013-05-05 18:44:10 -04:00
commit db4eb20bc3
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
js/reveal.js
View File

@ -1632,11 +1632,19 @@ var Reveal = (function(){
var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment:not(.visible)' ) ); var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment:not(.visible)' ) );
if( fragments.length ) { if( fragments.length ) {
fragments[0].classList.add( 'visible' ); // There may be multiple fragments with the same index. We want to display all of them.
var nextFragmentIndex = fragments[0].getAttribute( 'data-fragment-index' );
// Notify subscribers of the change
dispatchEvent( 'fragmentshown', { fragment: fragments[0] } ); toArray( fragments ).forEach( function( thisFragment ) {
var f = thisFragment.getAttribute( 'data-fragment-index' );
if( f === nextFragmentIndex ) {
thisFragment.classList.add( 'visible' );
// Notify subscribers of the change
dispatchEvent( 'fragmentshown', { fragment: thisFragment } );
}
} );
updateControls(); updateControls();
return true; return true;
} }
@ -1658,10 +1666,18 @@ var Reveal = (function(){
var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment.visible' ) ); var fragments = sortFragments( currentSlide.querySelectorAll( '.fragment.visible' ) );
if( fragments.length ) { if( fragments.length ) {
fragments[ fragments.length - 1 ].classList.remove( 'visible' ); // There may be multiple fragments with the same index. We want to display all of them.
var prevFragmentIndex = fragments[0].getAttribute( 'data-fragment-index' );
// Notify subscribers of the change
dispatchEvent( 'fragmenthidden', { fragment: fragments[ fragments.length - 1 ] } ); toArray( fragments ).forEach( function( thisFragment ) {
var f = thisFragment.getAttribute( 'data-fragment-index' );
if( f === prevFragmentIndex ) {
thisFragment.classList.remove( 'visible' );
// Notify subscribers of the change
dispatchEvent( 'fragmenthidden', { fragment: thisFragment } );
}
} );
updateControls(); updateControls();
return true; return true;
@ -2229,4 +2245,4 @@ var Reveal = (function(){
} }
}; };
})(); })();

1
plugin/notes/notes.html
View File

@ -14,6 +14,7 @@
font-size: 24px; font-size: 24px;
width: 640px; width: 640px;
margin-top: 5px; margin-top: 5px;
clear: left;
} }
#wrap-current-slide { #wrap-current-slide {