diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | plugin/markdown/example.html | 4 | ||||
| -rwxr-xr-x | plugin/markdown/markdown.js | 10 | ||||
| -rw-r--r-- | test/test-markdown-element-attributes.html | 8 | ||||
| -rw-r--r-- | test/test-markdown-slide-attributes.html | 10 | ||||
| -rw-r--r-- | test/test-markdown.html | 4 |
6 files changed, 21 insertions, 21 deletions
@@ -59,8 +59,8 @@ When used locally, this feature requires that reveal.js [runs from a local web s ```html <section data-markdown="example.md" data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-charset="iso-8859-15"> </section> ``` @@ -621,7 +621,7 @@ When used locally, this feature requires that reveal.js [runs from a local web s If you're using the external Markdown plugin, you can add notes with the help of a special delimiter: ```html -<section data-markdown="example.md" data-separator="^\n\n\n" data-vertical="^\n\n" data-notes="^Note:"></section> +<section data-markdown="example.md" data-separator="^\n\n\n" data-separator-vertical="^\n\n" data-separator-notes="^Note:"></section> # Title ## Sub-title 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/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html index b638082..27b888c 100644 --- a/test/test-markdown-element-attributes.html +++ b/test/test-markdown-element-attributes.html @@ -19,10 +19,10 @@ <div class="slides"> - <!-- <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 newline + three dashes + newline, vertical slides identical but two dashes --> - <section data-markdown data-separator="^\n---\n$" data-vertical="^\n--\n$" data-element-attributes="{_\s*?([^}]+?)}">> + <section data-markdown data-separator="^\n---\n$" data-separator-vertical="^\n--\n$" data-element-attributes="{_\s*?([^}]+?)}">> <script type="text/template"> ## Slide 1.1 <!-- {_class="fragment fade-out" data-fragment-index="1"} --> @@ -75,8 +75,8 @@ <section data-markdown data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-charset="utf-8"> <script type="text/template"> # Test attributes in Markdown with default separator diff --git a/test/test-markdown-slide-attributes.html b/test/test-markdown-slide-attributes.html index 3b91784..bd7b28f 100644 --- a/test/test-markdown-slide-attributes.html +++ b/test/test-markdown-slide-attributes.html @@ -19,12 +19,12 @@ <div class="slides"> - <!-- <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 lines, vertical slides by two lines, attributes are one any line starting with (spaces and) two dashes --> <section data-markdown data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-attributes="--\s(.*?)$" data-charset="utf-8"> <script type="text/template"> @@ -56,8 +56,8 @@ </section> <section data-markdown data-separator="^\n\n\n" - data-vertical="^\n\n" - data-notes="^Note:" + data-separator-vertical="^\n\n" + data-separator-notes="^Note:" data-charset="utf-8"> <script type="text/template"> # Test attributes in Markdown with default separator diff --git a/test/test-markdown.html b/test/test-markdown.html index c89af30..901b2de 100644 --- a/test/test-markdown.html +++ b/test/test-markdown.html @@ -19,10 +19,10 @@ <div class="slides"> - <!-- <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 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"> ## Slide 1.1 |