Changeset 2185054

Timestamp:

11/02/2019 08:13:45 PM (6 years ago)

Author:

iseulde

Message:

v0.0.37

Location:

slide/trunk

Files:

• index.php (modified) (2 diffs)
• readme.md (modified) (1 diff)
• reveal/notes.min.js (modified) (1 diff)
• speaker.js (modified) (2 diffs)
• template.php (modified) (1 diff)

slide/trunk/index.php

@@ -5 +5 @@
  * Plugin URI:  https://wordpress.org/plugins/slide/
  * Description: Allows you to create presentations with the block editor.
- * Version:     0.0.36
+ * Version:     0.0.37
  * Author:      Ella van Durpe
  * Author URI:  https://ellavandurpe.com
@@ -167 +167 @@
         plugins_url( 'reveal/notes.min.js', __FILE__ ),
         array( 'slide-reveal' ),
-        '3.8.0',
+        filemtime( dirname( __FILE__ ) . '/reveal/notes.min.js' ),
         true
     );

slide/trunk/readme.md

@@ -6 +6 @@
     Requires PHP:      5.6
     Tested up to:      5.3
-    Stable tag:        0.0.36
+    Stable tag:        0.0.37
     License:           GPL-2.0-or-later
     License URI:       http://www.gnu.org/licenses/gpl-2.0.html

slide/trunk/reveal/notes.min.js

@@ -1 @@
-var RevealNotes=function(){var l=null;function e(e){if(!l||l.closed){if(!e){var t=document.querySelector('script[src$="notes.js"]').src;e=(t=t.replace(/notes\.js(\?.*)?$/,""))+"notes.html"}var o;if(l=window.open(e,"reveal.js - Notes","width=1100,height=700"))o=setInterval(function(){l.postMessage(JSON.stringify({namespace:"reveal-notes",type:"connect",url:window.location.protocol+"//"+window.location.host+window.location.pathname+window.location.search,state:Reveal.getState()}),"*")},500),window.addEventListener("message",function(e){var t,a,n,s,r=JSON.parse(e.data);r&&"reveal-notes"===r.namespace&&"connected"===r.type&&(clearInterval(o),Reveal.addEventListener("slidechanged",i),Reveal.addEventListener("fragmentshown",i),Reveal.addEventListener("fragmenthidden",i),Reveal.addEventListener("overviewhidden",i),Reveal.addEventListener("overviewshown",i),Reveal.addEventListener("paused",i),Reveal.addEventListener("resumed",i),i()),r&&"reveal-notes"===r.namespace&&"call"===r.type&&(t=r.methodName,a=r.arguments,n=r.callId,s=Reveal[t].apply(Reveal,a),l.postMessage(JSON.stringify({namespace:"reveal-notes",type:"return",result:s,callId:n}),"*"))});else alert("Speaker view popup failed to open. Please make sure popups are allowed and reopen the speaker view.")}else l.focus();function i(e){var t=Reveal.getCurrentSlide(),a=t.querySelector("aside.notes"),n=t.querySelector(".current-fragment"),s={namespace:"reveal-notes",type:"state",notes:"",markdown:!1,whitespace:"normal",state:Reveal.getState()};if(t.hasAttribute("data-notes")&&(s.notes=t.getAttribute("data-notes"),s.whitespace="pre-wrap"),n){var r=n.querySelector("aside.notes");r?a=r:n.hasAttribute("data-notes")&&(s.notes=n.getAttribute("data-notes"),s.whitespace="pre-wrap",a=null)}a&&(s.notes=a.innerHTML,s.markdown="string"==typeof a.getAttribute("data-markdown")),l.postMessage(JSON.stringify(s),"*")}}return{init:function(){/receiver/i.test(window.location.search)||(null!==window.location.search.match(/(\?|\&)notes/gi)&&e(),Reveal.addKeyBinding({keyCode:83,key:"S",description:"Speaker notes view"},function(){e()}))},open:e}}();Reveal.registerPlugin("notes",RevealNotes);
+/**
+ * Handles opening of and synchronization with the reveal.js
+ * notes window.
+ *
+ * Handshake process:
+ * 1. This window posts 'connect' to notes window
+ *    - Includes URL of presentation to show
+ * 2. Notes window responds with 'connected' when it is available
+ * 3. This window proceeds to send the current presentation state
+ *    to the notes window
+ */
+var RevealNotes = (function() {
+
+    var notesPopup = null;
+
+    window.addEventListener( 'unload', function() {
+        if ( notesPopup ) {
+            notesPopup.close();
+        }
+    } );
+
+    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';
+        }
+
+        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.' );
+            return;
+        }
+
+        /**
+         * Connect to the notes window through a postmessage handshake.
+         * Using postmessage enables us to work in situations where the
+         * origins differ, such as a presentation being opened from the
+         * file system.
+         */
+        function connect() {
+            // Keep trying to connect until we get a 'connected' message back
+            var connectInterval = setInterval( function() {
+                notesPopup.postMessage( JSON.stringify( {
+                    namespace: 'reveal-notes',
+                    type: 'connect',
+                    url: window.location.protocol + '//' + window.location.host + window.location.pathname + window.location.search,
+                    state: Reveal.getState()
+                } ), '*' );
+            }, 500 );
+
+            window.addEventListener( 'message', function( event ) {
+                var data = JSON.parse( event.data );
+                if( data && data.namespace === 'reveal-notes' && data.type === 'connected' ) {
+                    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].apply( Reveal, methodArguments );
+            notesPopup.postMessage( JSON.stringify( {
+                namespace: 'reveal-notes',
+                type: 'return',
+                result: result,
+                callId: callId
+            } ), '*' );
+
+        }
+
+        /**
+         * Posts the current slide data to the notes window
+         */
+        function post( event ) {
+
+            var slideElement = Reveal.getCurrentSlide(),
+                notesElement = slideElement.querySelector( 'aside.notes' ),
+                fragmentElement = slideElement.querySelector( '.current-fragment' );
+
+            var messageData = {
+                namespace: 'reveal-notes',
+                type: 'state',
+                notes: '',
+                markdown: false,
+                whitespace: 'normal',
+                state: Reveal.getState()
+            };
+
+            // Look for notes defined in a slide attribute
+            if( slideElement.hasAttribute( 'data-notes' ) ) {
+                messageData.notes = slideElement.getAttribute( 'data-notes' );
+                messageData.whitespace = 'pre-wrap';
+            }
+
+            // Look for notes defined in a fragment
+            if( fragmentElement ) {
+                var fragmentNotes = fragmentElement.querySelector( 'aside.notes' );
+                if( fragmentNotes ) {
+                    notesElement = fragmentNotes;
+                }
+                else if( fragmentElement.hasAttribute( 'data-notes' ) ) {
+                    messageData.notes = fragmentElement.getAttribute( 'data-notes' );
+                    messageData.whitespace = 'pre-wrap';
+
+                    // In case there are slide notes
+                    notesElement = null;
+                }
+            }
+
+            // Look for notes defined in an aside element
+            if( notesElement ) {
+                messageData.notes = notesElement.innerHTML;
+                messageData.markdown = typeof notesElement.getAttribute( 'data-markdown' ) === 'string';
+            }
+
+            notesPopup.postMessage( JSON.stringify( messageData ), '*' );
+
+        }
+
+        /**
+         * Called once we have established a connection to the notes
+         * window.
+         */
+        function onConnected() {
+
+            // Monitor events that trigger a change in state
+            Reveal.addEventListener( 'slidechanged', post );
+            Reveal.addEventListener( 'fragmentshown', post );
+            Reveal.addEventListener( 'fragmenthidden', post );
+            Reveal.addEventListener( 'overviewhidden', post );
+            Reveal.addEventListener( 'overviewshown', post );
+            Reveal.addEventListener( 'paused', post );
+            Reveal.addEventListener( 'resumed', post );
+
+            // Post the initial state
+            post();
+
+        }
+
+        connect();
+
+    }
+
+    return {
+        init: function() {
+
+            if( !/receiver/i.test( window.location.search ) ) {
+
+                // If the there's a 'notes' query set, open directly
+                if( window.location.search.match( /(\?|\&)notes/gi ) !== null ) {
+                    openNotes();
+                }
+
+                // Open the notes when the 's' key is hit
+                Reveal.addKeyBinding({keyCode: 83, key: 'S', description: 'Speaker notes view'}, function() {
+                    openNotes();
+                } );
+
+            }
+
+        },
+
+        open: openNotes
+    };
+
+})();
+
+Reveal.registerPlugin( 'notes', RevealNotes );

slide/trunk/speaker.js

@@ -34 +34 @@
   });
 
+  window.opener.addEventListener('beforeunload', () => {
+    window.close();
+    console.log( 'test' );
+  });
+
   window.addEventListener('message', function (event) {
     var data = JSON.parse(event.data);
@@ -48 +53 @@
         handleStateMessage(data);
       } else if (data.type === 'return') {
+        console.log( data, pendingCalls );
         pendingCalls[data.callId](data.result);
-        delete pendingCalls[data.callId];
+        // delete pendingCalls[data.callId];
       }
     // Messages sent by the reveal.js inside of the current slide preview

slide/trunk/template.php

@@ -243 +243 @@
             const svg = event.currentSlide.getAttribute( 'data-background-svg' );
 
-            console.log( event );
-
             if ( ! svg ) {
                 return;