xobs/fa23-si
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format tweaks markdown.js, remove extra image asset

Browse Source
This commit is contained in:
Hakim El Hattab
2013-10-28 09:06:43 -04:00
parent 6cf5269bfc
commit d844195be1
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugin/markdown/markdown.js
View File

@@ -28,7 +28,7 @@
var DEFAULT_SLIDE_SEPARATOR = '^\n---\n$',
DEFAULT_NOTES_SEPARATOR = 'note:';
DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{\\\.\s*?([^}]+?)}';
DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{_\s*?([^}]+?)}';
/**
@@ -278,6 +278,7 @@
* http://stackoverflow.com/questions/5690269/disabling-chrome-cache-for-website-development/7000899#answer-11786277
*/
function addAttributeInElement( node, elementTarget, separator ) {
var mardownClassesInElementsRegex = new RegExp( separator, 'mg' );
var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' );
var nodeValue = node.nodeValue;
@@ -291,32 +292,35 @@
elementTarget.setAttribute( matchesClass[1], matchesClass[2] );
}
}
}
/**
* Add attributes to the parent element of a text node,
* or the element of an attribute node.
*/
function addAttributes( element, separator )
{
if ( element.childNodes.length > 0 ) {
function addAttributes( element, separator ) {
if( element.childNodes.length > 0 ) {
for( var i = 0; i < element.childNodes.length; i++ ) {
addAttributes( element.childNodes[i], separator );
}
}
var nodeValue;
var elementTarget;
// From http://stackoverflow.com/questions/9178174/find-all-text-nodes
if( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) {
addAttributeInElement( element, element.parentNode, separator );
}
if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) {
for ( iattr=0; iattr<element.attributes.length; iattr++ ){
var attr = element.attributes[iattr];
addAttributeInElement(attr, element, separator )
for( var j = 0; j < element.attributes.length; j++ ){
var attr = element.attributes[j];
addAttributeInElement( attr, element, separator );
}
}
}
/**

BIN
test/red-curtain-50x50.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

6
test/test-element-attributes-markdown.html
View File

@@ -22,9 +22,7 @@
<!-- <section data-markdown="example.md" data-separator="^\n\n\n" data-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-vertical="^\n--\n$">
<script type="text/template">
## Slide 1.1 {_class="fragment fade-out" data-fragment-index="1"}
@@ -63,7 +61,7 @@
Test
![Example Picture{_class="reveal stretch"}](red-curtain-50x50.jpg)
![Example Picture{_class="reveal stretch"}](assets/image2.png)
</script>
</section>