Merge branch 'master' of github.com:hakimel/reveal.js into dev
This commit is contained in:
commit
c49f76d271
|
@ -50,7 +50,7 @@ var RevealNotes = (function() {
|
||||||
/**
|
/**
|
||||||
* Posts the current slide data to the notes window
|
* Posts the current slide data to the notes window
|
||||||
*/
|
*/
|
||||||
function post() {
|
function post(event) {
|
||||||
|
|
||||||
var slideElement = Reveal.getCurrentSlide(),
|
var slideElement = Reveal.getCurrentSlide(),
|
||||||
notesElement = slideElement.querySelector( 'aside.notes' );
|
notesElement = slideElement.querySelector( 'aside.notes' );
|
||||||
|
@ -64,6 +64,15 @@ var RevealNotes = (function() {
|
||||||
state: Reveal.getState()
|
state: Reveal.getState()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Look for notes defined in a fragment, if it is a fragmentshown event
|
||||||
|
if (event && event.hasOwnProperty('fragment')) {
|
||||||
|
var innerNotes = event.fragment.querySelector( 'aside.notes' );
|
||||||
|
|
||||||
|
if ( innerNotes) {
|
||||||
|
notesElement = innerNotes;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Look for notes defined in a slide attribute
|
// Look for notes defined in a slide attribute
|
||||||
if( slideElement.hasAttribute( 'data-notes' ) ) {
|
if( slideElement.hasAttribute( 'data-notes' ) ) {
|
||||||
messageData.notes = slideElement.getAttribute( 'data-notes' );
|
messageData.notes = slideElement.getAttribute( 'data-notes' );
|
||||||
|
|
Loading…
Reference in New Issue