Ver código fonte

Merge pull request #2251 from oyron/2229-speaker-notes-bug

Give focus to previously opened speaker notes (fixes #2229)
Hakim El Hattab 6 anos atrás
pai
commit
e7a365255f
1 arquivos alterados com 8 adições e 1 exclusões
  1. 8 1
      plugin/notes/notes.js

+ 8 - 1
plugin/notes/notes.js

@@ -11,15 +11,22 @@
  */
 var RevealNotes = (function() {
 
+    var notesPopup = null;
+
 	function openNotes( notesFilePath ) {
 
+        if (notesPopup && !notesPopup.closed) {
+            notesPopup.focus();
+            return;
+        }
+
 		if( !notesFilePath ) {
 			var jsFileLocation = document.querySelector('script[src$="notes.js"]').src;  // this js file path
 			jsFileLocation = jsFileLocation.replace(/notes\.js(\?.*)?$/, '');   // the js folder path
 			notesFilePath = jsFileLocation + 'notes.html';
 		}
 
-		var notesPopup = window.open( notesFilePath, 'reveal.js - Notes', 'width=1100,height=700' );
+		notesPopup = window.open( notesFilePath, 'reveal.js - Notes', 'width=1100,height=700' );
 
 		if( !notesPopup ) {
 			alert( 'Speaker view popup failed to open. Please make sure popups are allowed and reopen the speaker view.' );