jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

resolve notes merge conflict

Browse source
This commit is contained in:
Hakim El Hattab 2018-10-04 12:32:28 +02:00
commit 8582c9aac8
4 changed files with 173 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plugin/notes/notes.js
View file

@ -26,9 +26,6 @@ var RevealNotes = (function() {
return;
}
// Allow popup window access to Reveal API
notesPopup.Reveal = window.Reveal;
/**
* Connect to the notes window through a postmessage handshake.
* Using postmessage enables us to work in situations where the
@ -52,9 +49,26 @@ var RevealNotes = (function() {
clearInterval( connectInterval );
onConnected();
}
if( data && data.namespace === 'reveal-notes' && data.type === 'call' ) {
callRevealApi( data.methodName, data.arguments, data.callId );
}
} );
}
/**
* Calls the specified Reveal.js method with the provided argument and then pushes the result to the notes
* frame.
*/
function callRevealApi( methodName, methodArguments, callId ) {
var result = Reveal[methodName].call(Reveal, methodArguments);
notesPopup.postMessage( JSON.stringify( {
namespace: 'reveal-notes',
type: 'return',
result: result,
callId: callId
} ), '*' );
}
/**
* Posts the current slide data to the notes window
*/