diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/markdown/markdown.js | 10 | ||||
| -rw-r--r-- | plugin/multiplex/index.js | 16 | ||||
| -rw-r--r-- | plugin/multiplex/master.js | 5 | ||||
| -rw-r--r-- | plugin/search/search.js | 192 |
4 files changed, 209 insertions, 14 deletions
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 39e1168..b6b5a9b 100644 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -26,7 +26,11 @@ return text; }; - + + var twrap = function(el) { + return '<script type="text/template">' + el + '</script>'; + }; + var slidifyMarkdown = function(markdown, separator, vertical) { separator = separator || '^\n---\n$'; @@ -74,8 +78,8 @@ // flatten the hierarchical stack, and insert <section data-markdown> tags for( var k = 0, klen = sectionStack.length; k < klen; k++ ) { markdownSections += typeof sectionStack[k] === 'string' - ? '<section data-markdown>' + sectionStack[k] + '</section>' - : '<section><section data-markdown>' + sectionStack[k].join('</section><section data-markdown>') + '</section></section>'; + ? '<section data-markdown>' + twrap( sectionStack[k] ) + '</section>' + : '<section><section data-markdown>' + sectionStack[k].map(twrap).join('</section><section data-markdown>') + '</section></section>'; } return markdownSections; diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js index aa8a55a..bf22cb1 100644 --- a/plugin/multiplex/index.js +++ b/plugin/multiplex/index.js @@ -1,16 +1,16 @@ -var express = require('express'); -var fs = require('fs'); -var io = require('socket.io'); +var express = require('express'); +var fs = require('fs'); +var io = require('socket.io'); var crypto = require('crypto'); -var app = express.createServer(); -var staticDir = express.static; +var app = express.createServer(); +var staticDir = express.static; -io = io.listen(app); +io = io.listen(app); var opts = { - port : 1948, - baseDir : __dirname + '/../../' + port: 1948, + baseDir : __dirname + '/../../' }; io.sockets.on('connection', function(socket) { diff --git a/plugin/multiplex/master.js b/plugin/multiplex/master.js index a896244..5c18390 100644 --- a/plugin/multiplex/master.js +++ b/plugin/multiplex/master.js @@ -4,7 +4,7 @@ var multiplex = window.globals.multiplex; var socket = io.connect(multiplex.url); - + Reveal.addEventListener( 'slidechanged', function( event ) { var nextindexh; var nextindexv; @@ -18,7 +18,6 @@ nextindexv = 0; } - var notes = slideElement.querySelector('aside.notes'); var slideData = { indexh : event.indexh, indexv : event.indexv, @@ -28,6 +27,6 @@ socketId : multiplex.id }; - if( typeof event.origin === 'undefined' && event.origin !== 'remote') socket.emit('slidechanged', slideData); + if( typeof event.origin === 'undefined' && event.origin !== 'remote' ) socket.emit('slidechanged', slideData); } ); }()); diff --git a/plugin/search/search.js b/plugin/search/search.js new file mode 100644 index 0000000..28f10ca --- /dev/null +++ b/plugin/search/search.js @@ -0,0 +1,192 @@ +/* + * Handles finding a text string anywhere in the slides and showing the next occurrence to the user + * by navigatating to that slide and highlighting it. + * + * By Jon Snyder <snyder.jon@gmail.com>, February 2013 + */ + +var RevealSearch = (function() { + + var matchedSlides; + var currentMatchedIndex; + var searchboxDirty; + var myHilitor; + +// Original JavaScript code by Chirp Internet: www.chirp.com.au +// Please acknowledge use of this code by including this header. +// 2/2013 jon: modified regex to display any match, not restricted to word boundaries. + +function Hilitor(id, tag) +{ + + var targetNode = document.getElementById(id) || document.body; + var hiliteTag = tag || "EM"; + var skipTags = new RegExp("^(?:" + hiliteTag + "|SCRIPT|FORM|SPAN)$"); + var colors = ["#ff6", "#a0ffff", "#9f9", "#f99", "#f6f"]; + var wordColor = []; + var colorIdx = 0; + var matchRegex = ""; + var matchingSlides = []; + + this.setRegex = function(input) + { + input = input.replace(/^[^\w]+|[^\w]+$/g, "").replace(/[^\w'-]+/g, "|"); + matchRegex = new RegExp("(" + input + ")","i"); + } + + this.getRegex = function() + { + return matchRegex.toString().replace(/^\/\\b\(|\)\\b\/i$/g, "").replace(/\|/g, " "); + } + + // recursively apply word highlighting + this.hiliteWords = function(node) + { + if(node == undefined || !node) return; + if(!matchRegex) return; + if(skipTags.test(node.nodeName)) return; + + if(node.hasChildNodes()) { + for(var i=0; i < node.childNodes.length; i++) + this.hiliteWords(node.childNodes[i]); + } + if(node.nodeType == 3) { // NODE_TEXT + if((nv = node.nodeValue) && (regs = matchRegex.exec(nv))) { + //find the slide's section element and save it in our list of matching slides + var secnode = node.parentNode; + while (secnode.nodeName != 'SECTION') { + secnode = secnode.parentNode; + } + + var slideIndex = Reveal.getIndices(secnode); + var slidelen = matchingSlides.length; + var alreadyAdded = false; + for (var i=0; i < slidelen; i++) { + if ( (matchingSlides[i].h === slideIndex.h) && (matchingSlides[i].v === slideIndex.v) ) { + alreadyAdded = true; + } + } + if (! alreadyAdded) { + matchingSlides.push(slideIndex); + } + + if(!wordColor[regs[0].toLowerCase()]) { + wordColor[regs[0].toLowerCase()] = colors[colorIdx++ % colors.length]; + } + + var match = document.createElement(hiliteTag); + match.appendChild(document.createTextNode(regs[0])); + match.style.backgroundColor = wordColor[regs[0].toLowerCase()]; + match.style.fontStyle = "inherit"; + match.style.color = "#000"; + + var after = node.splitText(regs.index); + after.nodeValue = after.nodeValue.substring(regs[0].length); + node.parentNode.insertBefore(match, after); + } + } + }; + + // remove highlighting + this.remove = function() + { + var arr = document.getElementsByTagName(hiliteTag); + while(arr.length && (el = arr[0])) { + el.parentNode.replaceChild(el.firstChild, el); + } + }; + + // start highlighting at target node + this.apply = function(input) + { + if(input == undefined || !input) return; + this.remove(); + this.setRegex(input); + this.hiliteWords(targetNode); + return matchingSlides; + }; + +} + + function openSearch() { + //ensure the search term input dialog is visible and has focus: + var inputbox = document.getElementById("searchinput"); + inputbox.style.display = "inline"; + inputbox.focus(); + inputbox.select(); + } + + function toggleSearch() { + var inputbox = document.getElementById("searchinput"); + if (inputbox.style.display !== "inline") { + openSearch(); + } + else { + inputbox.style.display = "none"; + myHilitor.remove(); + } + } + + function doSearch() { + //if there's been a change in the search term, perform a new search: + if (searchboxDirty) { + var searchstring = document.getElementById("searchinput").value; + + //find the keyword amongst the slides + myHilitor = new Hilitor("slidecontent"); + matchedSlides = myHilitor.apply(searchstring); + currentMatchedIndex = 0; + } + + //navigate to the next slide that has the keyword, wrapping to the first if necessary + if (matchedSlides.length && (matchedSlides.length <= currentMatchedIndex)) { + currentMatchedIndex = 0; + } + if (matchedSlides.length > currentMatchedIndex) { + Reveal.slide(matchedSlides[currentMatchedIndex].h, matchedSlides[currentMatchedIndex].v); + currentMatchedIndex++; + } + } + + var dom = {}; + dom.wrapper = document.querySelector( '.reveal' ); + + if( !dom.wrapper.querySelector( '.searchbox' ) ) { + var searchElement = document.createElement( 'div' ); + searchElement.id = "searchinputdiv"; + searchElement.classList.add( 'searchdiv' ); + searchElement.innerHTML = '<span><input type="text" id="searchinput" class="searchinput"/><img src="css/theme/assets/searchicon.png" id="searchbutton" class="searchicon"/></span>'; + dom.wrapper.appendChild( searchElement ); + } + + document.getElementById("searchbutton").addEventListener( 'click', function(event) { + toggleSearch(); + }, false ); + + document.getElementById("searchinput").addEventListener( 'keyup', function( event ) { + switch (event.keyCode) { + case 13: + event.preventDefault(); + doSearch(); + searchboxDirty = false; + break; + default: + searchboxDirty = true; + } + }, false ); + + // Open the search when the 's' key is hit (yes, this conflicts with the notes plugin, disabling for now) + /* + document.addEventListener( 'keydown', function( event ) { + // Disregard the event if the target is editable or a + // modifier is present + if ( document.querySelector( ':focus' ) !== null || event.shiftKey || event.altKey || event.ctrlKey || event.metaKey ) return; + + if( event.keyCode === 83 ) { + event.preventDefault(); + openSearch(); + } + }, false ); +*/ + return { open: openSearch }; +})(); |