diff options
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/markdown/markdown.js | 18 | ||||
| -rw-r--r-- | plugin/multiplex/index.js | 1 |
2 files changed, 15 insertions, 4 deletions
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index b6b5a9b..3e31203 100644 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -26,11 +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$'; @@ -101,12 +101,22 @@ xhr.onreadystatechange = function () { if( xhr.readyState === 4 ) { - section.outerHTML = slidifyMarkdown( xhr.responseText, section.getAttribute('data-separator'), section.getAttribute('data-vertical') ); + if (xhr.status >= 200 && xhr.status < 300) { + section.outerHTML = slidifyMarkdown( xhr.responseText, section.getAttribute('data-separator'), section.getAttribute('data-vertical') ); + } else { + section.outerHTML = '<section data-state="alert">ERROR: The attempt to fetch ' + url + ' failed with the HTTP status ' + xhr.status + + '. Check your browser\'s JavaScript console for more details.' + + '<p>Remember that you need to serve the presentation HTML from a HTTP server and the Markdown file must be there too.</p></section>'; + } } }; xhr.open('GET', url, false); - xhr.send(); + try { + xhr.send(); + } catch (e) { + alert('Failed to get the Markdown file ' + url + '. Make sure that the presentation and the file are served by a HTTP server and the file can be found there. ' + e); + } } else if( section.getAttribute('data-separator') ) { diff --git a/plugin/multiplex/index.js b/plugin/multiplex/index.js index 0b03fc7..35df8e3 100644 --- a/plugin/multiplex/index.js +++ b/plugin/multiplex/index.js @@ -15,6 +15,7 @@ var opts = { io.sockets.on('connection', function(socket) { socket.on('slidechanged', function(slideData) { + if (typeof slideData.secret == 'undefined' || slideData.secret == null || slideData.secret === '') return; if (createHash(slideData.secret) === slideData.socketId) { slideData.secret = null; socket.broadcast.emit(slideData.socketId, slideData); |