From dd9fa3e22bd57fa7c5d16eeff4d84abf60f35fd6 Mon Sep 17 00:00:00 2001 From: VonC Date: Sun, 24 Nov 2013 21:27:30 +0100 Subject: First refactoring --- plugin/markdown/markdown.js | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 9564208..d399569 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -323,33 +323,50 @@ while( matchesClass = mardownClassRegex.exec( classes ) ) { elementTarget.setAttribute( matchesClass[1], matchesClass[2] ); } + return true; } - + return false; } /** * Add attributes to the parent element of a text node, * or the element of an attribute node. */ - function addAttributes( element, separator ) { + function addAttributes( section, element, previousElement, separatorElementAttributes, separatorSectionAttributes ) { - if( element.childNodes.length > 0 ) { + console.log("element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); + console.log("previousElement="+previousElement) + console.log("section=****"+section.outerHTML+"****"); + if( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { + previousParentElement = element; for( var i = 0; i < element.childNodes.length; i++ ) { - addAttributes( element.childNodes[i], separator ); + childElement = element.childNodes[i]; + console.log(" Child element='" + childElement.innerHTML + "'"); + if ( i > 0 ) { + previousParentElement = element.childNodes[i-1]; + } + parentSection = section; + if( childElement.nodeName == "section" ) { + parentSection = childElement ; + previousParentElement = childElement ; + } + addAttributes( parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes ); } } - var nodeValue; - var elementTarget; - + if ( element.nodeType == Node.COMMENT_NODE ) { + if ( addAttributeInElement( element, previousElement, separatorElementAttributes ) == false ) { + addAttributeInElement( element, section, separatorSectionAttributes); + } + } // 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 ); + addAttributeInElement( element, element.parentNode, separatorElementAttributes ); } if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) { for( var j = 0; j < element.attributes.length; j++ ){ var attr = element.attributes[j]; - addAttributeInElement( attr, element, separator ); + addAttributeInElement( attr, element, separatorElementAttributes ); } } @@ -376,9 +393,13 @@ var markdown = getMarkdownFromSlide( section ); section.innerHTML = marked( markdown ); - addAttributes( section, section.getAttribute( 'data-element-attributes' ) || + //console.log("markdown="+markdown); + addAttributes( section, section, null, section.getAttribute( 'data-element-attributes' ) || section.parentNode.getAttribute( 'data-element-attributes' ) || - DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR ); + DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR, + section.getAttribute( 'data-attributes' ) || + section.parentNode.getAttribute( 'data-attributes' ) || + DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR); // If there were notes, we need to re-add them after // having overwritten the section's HTML -- cgit v1.2.3 From 3330c2a7648767f0ef8298c152ae4f2dd2c38ba0 Mon Sep 17 00:00:00 2001 From: VonC Date: Mon, 25 Nov 2013 22:05:23 +0100 Subject: Remove section attribute implementation. --- plugin/markdown/markdown.js | 54 +++++++++------------------------------------ 1 file changed, 11 insertions(+), 43 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index d399569..d606a4b 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -97,7 +97,6 @@ options.separator = options.separator || DEFAULT_SLIDE_SEPARATOR; options.notesSeparator = options.notesSeparator || DEFAULT_NOTES_SEPARATOR; options.attributes = options.attributes || ''; - options.slideAttributesSeparator = options.slideAttributesSeparator || DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR; return options; @@ -129,17 +128,14 @@ options = getSlidifyOptions( options ); var separatorRegex = new RegExp( options.separator + ( options.verticalSeparator ? '|' + options.verticalSeparator : '' ), 'mg' ), - horizontalSeparatorRegex = new RegExp( options.separator ), - slideAttributesSeparatorRegex = new RegExp( options.slideAttributesSeparator, 'm' ); + horizontalSeparatorRegex = new RegExp( options.separator ); var matches, lastIndex = 0, isHorizontal, wasHorizontal = true, content, - sectionStack = [], - matchAttributes, - slideAttributes = ""; + sectionStack = []; // iterate until all blocks between separators are stacked up while( matches = separatorRegex.exec( markdown ) ) { @@ -178,35 +174,19 @@ for( var i = 0, len = sectionStack.length; i < len; i++ ) { // vertical if( sectionStack[i] instanceof Array ) { - // The 'data-xxx' attributes of the first child must be set on the wrapping parent section to be effective - // Mainly for data-transition (otherwise, it is ignored for the first vertical slide) - firstChild = sectionStack[i][0]; - matchAttributes = slideAttributesSeparatorRegex.exec( firstChild ); - slideAttributes = matchAttributes ? matchAttributes[1] : ""; - dataAttributes = ""; - if( slideAttributes != "" ) { - // http://stackoverflow.com/questions/18025762/javascript-regex-replace-all-word-characters-except-word-characters-between-ch - // Keep only data-attributes for the parent slide section. - dataAttributes = slideAttributes.replace( /(data-\S+=\"[^\"]+?\")|\w|[\"=]/g, function(a, b) { return b || ''; }); - } - markdownSections += '
'; + markdownSections += '
'; sectionStack[i].forEach( function( child ) { - matchAttributes = slideAttributesSeparatorRegex.exec( child ); - slideAttributes = matchAttributes ? matchAttributes[1] : ""; - child = matchAttributes ? child.replace( slideAttributesSeparatorRegex,"" ) : child - markdownSections += '
' + createMarkdownSlide( child, options ) + '
'; + markdownSections += '
' + createMarkdownSlide( child, options ) + '
'; } ); markdownSections += '
'; } else { - matchAttributes = slideAttributesSeparatorRegex.exec( sectionStack[i] ); - slideAttributes = matchAttributes ? matchAttributes[1] : ""; - content = matchAttributes ? sectionStack[i].replace( slideAttributesSeparatorRegex,"" ) : sectionStack[i] - markdownSections += '
' + createMarkdownSlide( content, options ) + '
'; + markdownSections += '
' + createMarkdownSlide( sectionStack[i], options ) + '
'; } } + return markdownSections; } @@ -240,12 +220,12 @@ xhr.onreadystatechange = function() { if( xhr.readyState === 4 ) { if ( xhr.status >= 200 && xhr.status < 300 ) { + section.outerHTML = slidify( xhr.responseText, { separator: section.getAttribute( 'data-separator' ), verticalSeparator: section.getAttribute( 'data-vertical' ), notesSeparator: section.getAttribute( 'data-notes' ), - attributes: getForwardedAttributes( section ), - slideAttributesSeparator: section.getAttribute( 'data-attributes' ), + attributes: getForwardedAttributes( section ) }); } @@ -277,24 +257,12 @@ separator: section.getAttribute( 'data-separator' ), verticalSeparator: section.getAttribute( 'data-vertical' ), notesSeparator: section.getAttribute( 'data-notes' ), - attributes: getForwardedAttributes( section ), - slideAttributesSeparator: section.getAttribute( 'data-attributes' ), + attributes: getForwardedAttributes( section ) }); } else { - var content = getMarkdownFromSlide( section ); - var slideAttributesSeparatorRegex = new RegExp( section.getAttribute( 'data-attributes' ) || DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR, 'm' ); - var matchAttributes = slideAttributesSeparatorRegex.exec( content ); - if ( matchAttributes ) { - var slideAttributes = matchAttributes[1]; - content = content.replace( slideAttributesSeparatorRegex,"" ); - var slideAttributesRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' ); - while( matchesAttributes = slideAttributesRegex.exec( slideAttributes ) ) { - section.setAttribute( matchesAttributes[1], matchesAttributes[2] ); - } - } - section.innerHTML = createMarkdownSlide( content ); + section.innerHTML = createMarkdownSlide( getMarkdownFromSlide( section ) ); } } @@ -334,7 +302,7 @@ */ function addAttributes( section, element, previousElement, separatorElementAttributes, separatorSectionAttributes ) { - console.log("element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); + console.log("element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); console.log("previousElement="+previousElement) console.log("section=****"+section.outerHTML+"****"); if( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { -- cgit v1.2.3 From 8ad633e4f3cdc576601e9b9aa5cd85c1f08e427e Mon Sep 17 00:00:00 2001 From: VonC Date: Wed, 27 Nov 2013 22:48:01 +0100 Subject: Fix element attributes, except for multi-line. --- plugin/markdown/markdown.js | 38 +++++++++++---------- test/test-markdown-attributes.html | 8 ++--- test/test-markdown-element-attributes.html | 53 ++++++++++++++++++++---------- 3 files changed, 60 insertions(+), 39 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index d606a4b..34458f2 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -29,7 +29,7 @@ var DEFAULT_SLIDE_SEPARATOR = '^\n---\n$', DEFAULT_NOTES_SEPARATOR = 'note:', DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{\\\.\s*?([^}]+?)}', - DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '^.*?'; + DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = 'slide-attributes:\\\s(.*?)$'; /** @@ -73,7 +73,7 @@ value = attributes[i].value; // disregard attributes that are used for markdown loading/parsing - if( /data\-(markdown|separator|vertical|notes|attributes)/gi.test( name ) ) continue; + if( /data\-(markdown|separator|vertical|notes)/gi.test( name ) ) continue; if( value ) { result.push( name + '=' + value ); @@ -282,12 +282,13 @@ var mardownClassesInElementsRegex = new RegExp( separator, 'mg' ); var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' ); var nodeValue = node.nodeValue; + console.log("=== node.nodeValue='" + nodeValue + "' vs. separator '" + separator + "'"); if( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) { var classes = matches[1]; nodeValue = nodeValue.substring( 0, matches.index ) + nodeValue.substring( mardownClassesInElementsRegex.lastIndex ); node.nodeValue = nodeValue; - + console.log("=========== classes='" + classes + "'"); while( matchesClass = mardownClassRegex.exec( classes ) ) { elementTarget.setAttribute( matchesClass[1], matchesClass[2] ); } @@ -302,15 +303,15 @@ */ function addAttributes( section, element, previousElement, separatorElementAttributes, separatorSectionAttributes ) { - console.log("element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); + console.log("*** element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); console.log("previousElement="+previousElement) console.log("section=****"+section.outerHTML+"****"); - if( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { + if ( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { previousParentElement = element; for( var i = 0; i < element.childNodes.length; i++ ) { childElement = element.childNodes[i]; - console.log(" Child element='" + childElement.innerHTML + "'"); - if ( i > 0 ) { + console.log(" Child element='" + childElement.innerHTML + "', type " + childElement.nodeType); + if ( i > 0 && typeof element.childNodes[i-1].setAttribute == 'function' ) { previousParentElement = element.childNodes[i-1]; } parentSection = section; @@ -318,7 +319,10 @@ parentSection = childElement ; previousParentElement = childElement ; } - addAttributes( parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes ); + if ( typeof childElement.setAttribute == 'function' || childElement.nodeType == Node.COMMENT_NODE ) { + console.log(" CALL addAttributes") + addAttributes( parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes ); + } } } @@ -328,15 +332,15 @@ } } // From http://stackoverflow.com/questions/9178174/find-all-text-nodes - if( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) { - addAttributeInElement( element, element.parentNode, separatorElementAttributes ); - } - if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) { - for( var j = 0; j < element.attributes.length; j++ ){ - var attr = element.attributes[j]; - addAttributeInElement( attr, element, separatorElementAttributes ); - } - } + //if( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) { + // addAttributeInElement( element, element.parentNode, separatorElementAttributes ); + //} + //if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) { + // for( var j = 0; j < element.attributes.length; j++ ){ + // var attr = element.attributes[j]; + // addAttributeInElement( attr, element, separatorElementAttributes ); + // } + //} } diff --git a/test/test-markdown-attributes.html b/test/test-markdown-attributes.html index 8f77dac..6818cd5 100644 --- a/test/test-markdown-attributes.html +++ b/test/test-markdown-attributes.html @@ -25,7 +25,7 @@
-- cgit v1.2.3 From d52eb599d1f732876540f2a22fa406b7293502e5 Mon Sep 17 00:00:00 2001 From: VonC Date: Thu, 28 Nov 2013 22:10:23 +0100 Subject: Fix previous element selection. --- plugin/markdown/markdown.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 34458f2..2f6fc44 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -303,16 +303,24 @@ */ function addAttributes( section, element, previousElement, separatorElementAttributes, separatorSectionAttributes ) { - console.log("*** element='" + element.innerHTML + "', nodeType='" + element.nodeType + "'"); + console.log("*** element='" + element.tagName + "', nodeType='" + element.nodeType + "'"); console.log("previousElement="+previousElement) - console.log("section=****"+section.outerHTML+"****"); + //console.log("section=****"+section.outerHTML+"****"); if ( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { previousParentElement = element; for( var i = 0; i < element.childNodes.length; i++ ) { childElement = element.childNodes[i]; - console.log(" Child element='" + childElement.innerHTML + "', type " + childElement.nodeType); - if ( i > 0 && typeof element.childNodes[i-1].setAttribute == 'function' ) { - previousParentElement = element.childNodes[i-1]; + console.log(" Child element='" + childElement.tagName + "', type " + childElement.nodeType); + if ( i > 0 ) { + j = i - 1; + while ( j >= 0 ) { + aPreviousChildElement = element.childNodes[j]; + if ( typeof aPreviousChildElement.setAttribute == 'function' && aPreviousChildElement.tagName != "BR") { + previousParentElement = aPreviousChildElement; + break; + } + j = j - 1; + } } parentSection = section; if( childElement.nodeName == "section" ) { -- cgit v1.2.3 From 13da34cc6bf3b75cec3d4c2fd4f96b3f686fd8a9 Mon Sep 17 00:00:00 2001 From: VonC Date: Thu, 28 Nov 2013 22:12:22 +0100 Subject: Removes console.log calls. --- plugin/markdown/markdown.js | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 2f6fc44..6e12627 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -282,13 +282,11 @@ var mardownClassesInElementsRegex = new RegExp( separator, 'mg' ); var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' ); var nodeValue = node.nodeValue; - console.log("=== node.nodeValue='" + nodeValue + "' vs. separator '" + separator + "'"); if( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) { var classes = matches[1]; nodeValue = nodeValue.substring( 0, matches.index ) + nodeValue.substring( mardownClassesInElementsRegex.lastIndex ); node.nodeValue = nodeValue; - console.log("=========== classes='" + classes + "'"); while( matchesClass = mardownClassRegex.exec( classes ) ) { elementTarget.setAttribute( matchesClass[1], matchesClass[2] ); } @@ -303,19 +301,15 @@ */ function addAttributes( section, element, previousElement, separatorElementAttributes, separatorSectionAttributes ) { - console.log("*** element='" + element.tagName + "', nodeType='" + element.nodeType + "'"); - console.log("previousElement="+previousElement) - //console.log("section=****"+section.outerHTML+"****"); if ( element != null && element.childNodes != undefined && element.childNodes.length > 0 ) { previousParentElement = element; for( var i = 0; i < element.childNodes.length; i++ ) { childElement = element.childNodes[i]; - console.log(" Child element='" + childElement.tagName + "', type " + childElement.nodeType); if ( i > 0 ) { j = i - 1; while ( j >= 0 ) { aPreviousChildElement = element.childNodes[j]; - if ( typeof aPreviousChildElement.setAttribute == 'function' && aPreviousChildElement.tagName != "BR") { + if ( typeof aPreviousChildElement.setAttribute == 'function' && aPreviousChildElement.tagName != "BR" ) { previousParentElement = aPreviousChildElement; break; } @@ -328,7 +322,6 @@ previousParentElement = childElement ; } if ( typeof childElement.setAttribute == 'function' || childElement.nodeType == Node.COMMENT_NODE ) { - console.log(" CALL addAttributes") addAttributes( parentSection, childElement, previousParentElement, separatorElementAttributes, separatorSectionAttributes ); } } @@ -336,20 +329,9 @@ if ( element.nodeType == Node.COMMENT_NODE ) { if ( addAttributeInElement( element, previousElement, separatorElementAttributes ) == false ) { - addAttributeInElement( element, section, separatorSectionAttributes); + addAttributeInElement( element, section, separatorSectionAttributes ); } } - // From http://stackoverflow.com/questions/9178174/find-all-text-nodes - //if( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) { - // addAttributeInElement( element, element.parentNode, separatorElementAttributes ); - //} - //if( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) { - // for( var j = 0; j < element.attributes.length; j++ ){ - // var attr = element.attributes[j]; - // addAttributeInElement( attr, element, separatorElementAttributes ); - // } - //} - } /** @@ -373,7 +355,6 @@ var markdown = getMarkdownFromSlide( section ); section.innerHTML = marked( markdown ); - //console.log("markdown="+markdown); addAttributes( section, section, null, section.getAttribute( 'data-element-attributes' ) || section.parentNode.getAttribute( 'data-element-attributes' ) || DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR, -- cgit v1.2.3 From f2097417daca80b2caaed2661ee646e861d789c8 Mon Sep 17 00:00:00 2001 From: VonC Date: Sat, 30 Nov 2013 22:29:04 +0100 Subject: Simpler default syntax for markdown attributes. - on slides: .slide x=y - on elements: .element x=y Those are detected in html comment, in order to not be visible if a markdown is edited in an html editor. --- plugin/markdown/markdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugin/markdown') diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index 6e12627..19aea28 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -28,8 +28,8 @@ var DEFAULT_SLIDE_SEPARATOR = '^\n---\n$', DEFAULT_NOTES_SEPARATOR = 'note:', - DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '{\\\.\s*?([^}]+?)}', - DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = 'slide-attributes:\\\s(.*?)$'; + DEFAULT_ELEMENT_ATTRIBUTES_SEPARATOR = '\\\.element\\\s*?(.+?)$', + DEFAULT_SLIDE_ATTRIBUTES_SEPARATOR = '\\\.slide:\\\s*?(\\\S.+?)$'; /** -- cgit v1.2.3