xobs/lca20-bt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'md-error-handling' of https://github.com/jakubholynet/reveal.js into dev

Browse Source
This commit is contained in:
Hakim El Hattab
2013-03-30 21:54:30 -04:00
parent c2aff87379 f6487dc312
commit 433c7a66cd
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/markdown/markdown.js
View File

@@ -26,11 +26,11 @@
return text; return text;
}; };
var twrap = function(el) { var twrap = function(el) {
return '<script type="text/template">' + el + '</script>'; return '<script type="text/template">' + el + '</script>';
}; };
var slidifyMarkdown = function(markdown, separator, vertical) { var slidifyMarkdown = function(markdown, separator, vertical) {
separator = separator || '^\n---\n$'; separator = separator || '^\n---\n$';
@@ -101,12 +101,22 @@
xhr.onreadystatechange = function () { xhr.onreadystatechange = function () {
if( xhr.readyState === 4 ) { 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.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') ) { } else if( section.getAttribute('data-separator') ) {