diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/leap/leap.js | 6 | ||||
| -rw-r--r-- | plugin/markdown/example.html | 4 | ||||
| -rwxr-xr-x | plugin/markdown/markdown.js | 10 | ||||
| -rw-r--r-- | plugin/notes-server/client.js | 45 | ||||
| -rw-r--r-- | plugin/notes/notes.js | 21 |
5 files changed, 54 insertions, 32 deletions
diff --git a/plugin/leap/leap.js b/plugin/leap/leap.js index 9d5271a..48084ff 100644 --- a/plugin/leap/leap.js +++ b/plugin/leap/leap.js @@ -76,8 +76,10 @@ var b=right.criteria;if(a!==b){if(a>b||a===void 0)return 1;if(a<b||b===void 0)re pointer.style.borderRadius = size - 5 + 'px'; pointer.style.visibility = 'visible'; + tipPosition = frame.fingers[0].tipPosition; + if( config.autoCenter ) { - tipPosition = frame.fingers[0].tipPosition; + // Check whether the finger has entered the z range of the Leap Motion. Used for the autoCenter option. if( !entered ) { @@ -144,7 +146,7 @@ var b=right.criteria;if(a!==b){if(a>b||a===void 0)return 1;if(a<b||b===void 0)re // Two hand gestures else if( frame.hands.length === 2 ) { // Upward two hand swipe gesture - if( gesture.direction[1] > 0 && gesture.type === 'swipe' ) { + if( gesture.type === 'swipe' && gesture.direction[1] > 0 ) { Reveal.toggleOverview(); } diff --git a/plugin/markdown/example.html b/plugin/markdown/example.html index 909639f..364e866 100644 --- a/plugin/markdown/example.html +++ b/plugin/markdown/example.html @@ -19,7 +19,7 @@ <div class="slides"> <!-- Use external markdown resource, separate slides by three newlines; vertical slides by two newlines --> - <section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n"></section> + <section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n"></section> <!-- Slides are separated by three dashes (quick 'n dirty regular expression) --> <section data-markdown data-separator="---"> @@ -36,7 +36,7 @@ </section> <!-- Slides are separated by newline + three dashes + newline, vertical slides identical but two dashes --> - <section data-markdown data-separator="^\n---\n$" data-vertical="^\n--\n$"> + <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$"> <script type="text/template"> ## Demo 2 Slide 1.1 diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 19aea28..9b0dae9 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -223,8 +223,8 @@ section.outerHTML = slidify( xhr.responseText, { separator: section.getAttribute( 'data-separator' ), - verticalSeparator: section.getAttribute( 'data-vertical' ), - notesSeparator: section.getAttribute( 'data-notes' ), + verticalSeparator: section.getAttribute( 'data-separator-vertical' ), + notesSeparator: section.getAttribute( 'data-separator-notes' ), attributes: getForwardedAttributes( section ) }); @@ -251,12 +251,12 @@ } } - else if( section.getAttribute( 'data-separator' ) || section.getAttribute( 'data-vertical' ) || section.getAttribute( 'data-notes' ) ) { + else if( section.getAttribute( 'data-separator' ) || section.getAttribute( 'data-separator-vertical' ) || section.getAttribute( 'data-separator-notes' ) ) { section.outerHTML = slidify( getMarkdownFromSlide( section ), { separator: section.getAttribute( 'data-separator' ), - verticalSeparator: section.getAttribute( 'data-vertical' ), - notesSeparator: section.getAttribute( 'data-notes' ), + verticalSeparator: section.getAttribute( 'data-separator-vertical' ), + notesSeparator: section.getAttribute( 'data-separator-notes' ), attributes: getForwardedAttributes( section ) }); diff --git a/plugin/notes-server/client.js b/plugin/notes-server/client.js index 156cb9a..ee60ff7 100644 --- a/plugin/notes-server/client.js +++ b/plugin/notes-server/client.js @@ -1,12 +1,13 @@ (function() { // don't emit events from inside the previews themselves - if ( window.location.search.match( /receiver/gi ) ) { return; } + if( window.location.search.match( /receiver/gi ) ) { return; } - var socket = io.connect(window.location.origin); - var socketId = Math.random().toString().slice(2); - - console.log('View slide notes at ' + window.location.origin + '/notes/' + socketId); - window.open(window.location.origin + '/notes/' + socketId, 'notes-' + socketId); + var socket = io.connect( window.location.origin ); + var socketId = Math.random().toString().slice( 2 ); + + console.log( 'View slide notes at ' + window.location.origin + '/notes/' + socketId ); + + window.open( window.location.origin + '/notes/' + socketId, 'notes-' + socketId ); // Fires when a fragment is shown Reveal.addEventListener( 'fragmentshown', function( event ) { @@ -23,16 +24,17 @@ fragment : 'previous', socketId : socketId }; - socket.emit('fragmentchanged', fragmentData); + socket.emit( 'fragmentchanged', fragmentData ); } ); // Fires when slide is changed Reveal.addEventListener( 'slidechanged', function( event ) { - var nextindexh; - var nextindexv; - var slideElement = event.currentSlide; + var nextindexh, + nextindexv, + slideElement = event.currentSlide, + notesElement = slideElement.querySelector( 'aside.notes' ); - if (slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION') { + if( slideElement.nextElementSibling && slideElement.parentNode.nodeName == 'SECTION' ) { nextindexh = event.indexh; nextindexv = event.indexv + 1; } else { @@ -40,18 +42,27 @@ nextindexv = 0; } - var notes = slideElement.querySelector('aside.notes'); - var slideData = { - notes : notes ? notes.innerHTML : '', + var messageData = { + notes : '', indexh : event.indexh, indexv : event.indexv, nextindexh : nextindexh, nextindexv : nextindexv, socketId : socketId, - markdown : notes ? typeof notes.getAttribute('data-markdown') === 'string' : false - + markdown : false }; - socket.emit('slidechanged', slideData); + // Look for notes defined in a slide attribute + if( slideElement.hasAttribute( 'data-notes' ) ) { + messageData.notes = slideElement.getAttribute( 'data-notes' ); + } + + // Look for notes defined in an aside element + if( notesElement ) { + messageData.notes = notesElement.innerHTML; + messageData.markdown = typeof notesElement.getAttribute( 'data-markdown' ) === 'string'; + } + + socket.emit( 'slidechanged', messageData ); } ); }()); diff --git a/plugin/notes/notes.js b/plugin/notes/notes.js index 9a82c3c..3f68b5d 100644 --- a/plugin/notes/notes.js +++ b/plugin/notes/notes.js @@ -24,9 +24,7 @@ var RevealNotes = (function() { function post() { var slideElement = Reveal.getCurrentSlide(), slideIndices = Reveal.getIndices(), - messageData; - - var notes = slideElement.querySelector( 'aside.notes' ), + notesElement = slideElement.querySelector( 'aside.notes' ), nextindexh, nextindexv; @@ -38,16 +36,27 @@ var RevealNotes = (function() { nextindexv = 0; } - messageData = { - notes : notes ? notes.innerHTML : '', + var messageData = { + notes : '', indexh : slideIndices.h, indexv : slideIndices.v, indexf : slideIndices.f, nextindexh : nextindexh, nextindexv : nextindexv, - markdown : notes ? typeof notes.getAttribute( 'data-markdown' ) === 'string' : false + markdown : false }; + // Look for notes defined in a slide attribute + if( slideElement.hasAttribute( 'data-notes' ) ) { + messageData.notes = slideElement.getAttribute( 'data-notes' ); + } + + // 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 ), '*' ); } |