From 245efee894311bc2cafecf9f7fa61547013ac975 Mon Sep 17 00:00:00 2001
From: Adam Hepton
Date: Tue, 25 Jun 2013 12:15:22 +0100
Subject: Support for notes within markdown
---
plugin/markdown/markdown.js | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
(limited to 'plugin/markdown/markdown.js')
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 473666b..8366c50 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -28,7 +28,9 @@
};
var twrap = function(el) {
- return '';
+ var cnt = el.content || el;
+ cnt += el.asideContent ? ('') : '';
+ return '';
};
var getForwardedAttributes = function(section) {
@@ -40,7 +42,7 @@
value = attributes[i].value;
// disregard attributes that are used for markdown loading/parsing
- if( /data\-(markdown|separator|vertical)/gi.test( name ) ) continue;
+ if( /data\-(markdown|separator|vertical|notes)/gi.test( name ) ) continue;
if( value ) {
result.push( name + '=' + value );
@@ -53,22 +55,27 @@
return result.join( ' ' );
}
- var slidifyMarkdown = function(markdown, separator, vertical, attributes) {
+ var slidifyMarkdown = function(markdown, separator, vertical, notes, attributes) {
separator = separator || '^\n---\n$';
var reSeparator = new RegExp(separator + (vertical ? '|' + vertical : ''), 'mg'),
reHorSeparator = new RegExp(separator),
+ notesSeparator = new RegExp(notes, 'mg'),
matches,
+ noteMatch,
lastIndex = 0,
isHorizontal,
wasHorizontal = true,
content,
+ asideContent,
+ slide,
sectionStack = [],
markdownSections = '';
// iterate until all blocks between separators are stacked up
while( matches = reSeparator.exec(markdown) ) {
+ asideContent = null;
// determine direction (horizontal by default)
isHorizontal = reHorSeparator.test(matches[0]);
@@ -80,18 +87,28 @@
// pluck slide content from markdown input
content = markdown.substring(lastIndex, matches.index);
+ noteMatch = content.split(notesSeparator);
+
+ if(noteMatch.length === 2) {
+ content = noteMatch[0];
+ asideContent = noteMatch[1].trim();
+ }
+
+ slide = {
+ content: content,
+ asideContent: asideContent || ""
+ };
if( isHorizontal && wasHorizontal ) {
// add to horizontal stack
- sectionStack.push(content);
+ sectionStack.push(slide);
} else {
// add to vertical stack
- sectionStack[sectionStack.length-1].push(content);
+ sectionStack[sectionStack.length-1].push(slide);
}
lastIndex = reSeparator.lastIndex;
wasHorizontal = isHorizontal;
-
}
// add the remaining slide
@@ -99,15 +116,13 @@
// flatten the hierarchical stack, and insert tags
for( var k = 0, klen = sectionStack.length; k < klen; k++ ) {
- // horizontal
- if( typeof sectionStack[k] === 'string' ) {
- markdownSections += '' + twrap( sectionStack[k] ) + '';
- }
// vertical
- else {
+ if(sectionStack[k].propertyIsEnumerable(length) && typeof sectionStack[k].splice === "function") {
markdownSections += '' +
'' + sectionStack[k].map(twrap).join('' +
'';
+ } else {
+ markdownSections += '' + twrap( sectionStack[k] ) + '';
}
}
@@ -131,7 +146,7 @@
xhr.onreadystatechange = function () {
if( xhr.readyState === 4 ) {
if (xhr.status >= 200 && xhr.status < 300) {
- section.outerHTML = slidifyMarkdown( xhr.responseText, section.getAttribute('data-separator'), section.getAttribute('data-vertical'), getForwardedAttributes(section) );
+ section.outerHTML = slidifyMarkdown( xhr.responseText, section.getAttribute('data-separator'), section.getAttribute('data-vertical'), section.getAttribute('data-notes'), getForwardedAttributes(section) );
} else {
section.outerHTML = 'ERROR: The attempt to fetch ' + url + ' failed with the HTTP status ' + xhr.status +
'. Check your browser\'s JavaScript console for more details.' +
@@ -150,7 +165,7 @@
} else if( section.getAttribute('data-separator') ) {
var markdown = stripLeadingWhitespace(section);
- section.outerHTML = slidifyMarkdown( markdown, section.getAttribute('data-separator'), section.getAttribute('data-vertical'), getForwardedAttributes(section) );
+ section.outerHTML = slidifyMarkdown( markdown, section.getAttribute('data-separator'), section.getAttribute('data-vertical'), section.getAttribute('data-notes'), getForwardedAttributes(section) );
}
}
--
cgit v1.2.3
From ce0facf7b24bd43e8ca6e77f69fd2c651b840341 Mon Sep 17 00:00:00 2001
From: Emile 'iMil' Heitor
Date: Tue, 23 Jul 2013 17:31:30 +0200
Subject: added custom charset support for external markdown file
---
plugin/markdown/markdown.js | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'plugin/markdown/markdown.js')
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 473666b..9681cf1 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -128,6 +128,12 @@
var xhr = new XMLHttpRequest(),
url = section.getAttribute('data-markdown');
+ datacharset = section.getAttribute('data-charset');
+ // see https://developer.mozilla.org/en-US/docs/Web/API/element.getAttribute#Notes
+ if (datacharset != null && datacharset != '') {
+ xhr.overrideMimeType('text/html; charset=' + datacharset);
+ }
+
xhr.onreadystatechange = function () {
if( xhr.readyState === 4 ) {
if (xhr.status >= 200 && xhr.status < 300) {
--
cgit v1.2.3
From efbcab57f74891a060320af1c9e2e3c039febc5a Mon Sep 17 00:00:00 2001
From: Riceball LEE
Date: Wed, 31 Jul 2013 06:48:09 +0800
Subject: * [bug] fixed render markdown file error like this: ```html ```
---
plugin/markdown/markdown.js | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
(limited to 'plugin/markdown/markdown.js')
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js
index 473666b..dcab2fa 100755
--- a/plugin/markdown/markdown.js
+++ b/plugin/markdown/markdown.js
@@ -6,6 +6,14 @@
throw 'The reveal.js Markdown plugin requires marked to be loaded';
}
+ if (typeof hljs !== 'undefined') {
+ marked.setOptions({
+ highlight: function (lang, code) {
+ return hljs.highlightAuto(lang, code).value;
+ }
+ });
+ }
+
var stripLeadingWhitespace = function(section) {
var template = section.querySelector( 'script' );
@@ -28,7 +36,7 @@
};
var twrap = function(el) {
- return '';
+ return marked(el);
};
var getForwardedAttributes = function(section) {
@@ -51,7 +59,7 @@
}
return result.join( ' ' );
- }
+ };
var slidifyMarkdown = function(markdown, separator, vertical, attributes) {
@@ -101,12 +109,12 @@
for( var k = 0, klen = sectionStack.length; k < klen; k++ ) {
// horizontal
if( typeof sectionStack[k] === 'string' ) {
- markdownSections += '' + twrap( sectionStack[k] ) + '';
+ markdownSections += '' + twrap( sectionStack[k] ) + '';
}
// vertical
else {
markdownSections += '' +
- '' + sectionStack[k].map(twrap).join('' +
+ '' + sectionStack[k].map(twrap).join('' +
'';
}
}
--
cgit v1.2.3