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

notes plugin allows messsages from current/upcoming slide windows

Browse Source
This commit is contained in:
hakimel 2022-03-21 10:36:22 +01:00
parent 31407082eb
commit 0247ae7582
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/notes/notes.esm.js
View File

File diff suppressed because one or more lines are too long

2
plugin/notes/notes.js
View File

File diff suppressed because one or more lines are too long

1
plugin/notes/plugin.js
View File

@ -203,6 +203,7 @@ const Plugin = () => {
// that we remain connected to the notes even if the presentation // that we remain connected to the notes even if the presentation
// is reloaded. // is reloaded.
window.addEventListener( 'message', event => { window.addEventListener( 'message', event => {
if( !speakerWindow && typeof event.data === 'string' ) { if( !speakerWindow && typeof event.data === 'string' ) {
let data; let data;

9
plugin/notes/speaker-view.html
View File

@ -350,7 +350,8 @@
layoutDropdown, layoutDropdown,
pendingCalls = {}, pendingCalls = {},
lastRevealApiCallId = 0, lastRevealApiCallId = 0,
connected = false; connected = false,
whitelistedWindows = [window.opener];
var SPEAKER_LAYOUTS = { var SPEAKER_LAYOUTS = {
'default': 'Default', 'default': 'Default',
@ -368,8 +369,8 @@
; ;
window.addEventListener( 'message', function( event ) { window.addEventListener( 'message', function( event ) {
// Validate the origin of this message to avoid XSS // Validate the origin of this message to prevent XSS
if( window.location.origin !== event.origin && event.source !== window.opener ) { if( window.location.origin !== event.origin && whitelistedWindows.indexOf( event.source ) === -1 ) {
return; return;
} }
@ -538,6 +539,8 @@
upcomingSlide.setAttribute( 'src', upcomingURL ); upcomingSlide.setAttribute( 'src', upcomingURL );
document.querySelector( '#upcoming-slide' ).appendChild( upcomingSlide ); document.querySelector( '#upcoming-slide' ).appendChild( upcomingSlide );
whitelistedWindows.push( currentSlide.contentWindow, upcomingSlide.contentWindow );
} }
/** /**