Cleanup code, remove console log debugs.

This commit is contained in:
VonC 2013-10-26 22:33:43 +02:00
parent 28198b2ff0
commit 7aa93af0ca
1 changed files with 11 additions and 18 deletions

View File

@ -277,52 +277,45 @@
* directly on refresh (F5) * directly on refresh (F5)
* http://stackoverflow.com/questions/5690269/disabling-chrome-cache-for-website-development/7000899#answer-11786277 * http://stackoverflow.com/questions/5690269/disabling-chrome-cache-for-website-development/7000899#answer-11786277
*/ */
function addAttributeInElement(node, elementTarget){ function addAttributeInElement( node, elementTarget ){
var mardownClassesInElementsRegex = new RegExp( "{\\\.\s*?([^}]+?)}", 'mg' ); var mardownClassesInElementsRegex = new RegExp( "{\\\.\s*?([^}]+?)}", 'mg' );
var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' ); var mardownClassRegex = new RegExp( "([^\"= ]+?)=\"([^\"=]+?)\"", 'mg' );
var nodeValue = node.nodeValue; var nodeValue = node.nodeValue;
if ( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) { if ( matches = mardownClassesInElementsRegex.exec( nodeValue ) ) {
var classes = matches[1]; var classes = matches[1];
console.log("'" + classes + "'"); nodeValue = nodeValue.substring( 0, matches.index ) + nodeValue.substring( mardownClassesInElementsRegex.lastIndex );
nodeValue = nodeValue.substring(0,matches.index) + nodeValue.substring(mardownClassesInElementsRegex.lastIndex) + "ee";
console.log("'" + nodeValue + "'");
node.nodeValue = nodeValue; node.nodeValue = nodeValue;
console.log("'" + elementTarget.tagName + "'");
while( matchesClass = mardownClassRegex.exec( classes ) ) { while( matchesClass = mardownClassRegex.exec( classes ) ) {
console.log("attr='" + matchesClass[1] + "'='" + matchesClass[2] + "'");
elementTarget.setAttribute(matchesClass[1], matchesClass[2]); elementTarget.setAttribute(matchesClass[1], matchesClass[2]);
console.log("=>'" + elementTarget.attributes[matchesClass[1]].nodeValue + "'");
} }
} }
} }
/** /**
* Add classes to the parent element of a text node * Add attributes to the parent element of a text node,
* From http://stackoverflow.com/questions/9178174/find-all-text-nodes * or the element of an attribute node.
*/ */
function addAttributes(element) function addAttributes( element )
{ {
if ( element.childNodes.length > 0 ) { if ( element.childNodes.length > 0 ) {
for (var i = 0; i < element.childNodes.length; i++) { for ( var i = 0; i < element.childNodes.length; i++ ) {
addAttributes(element.childNodes[i]); addAttributes( element.childNodes[i] );
} }
} }
var nodeValue; var nodeValue;
var elementTarget; var elementTarget;
// From http://stackoverflow.com/questions/9178174/find-all-text-nodes
if ( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) { if ( element.nodeType == Node.TEXT_NODE && /\S/.test(element.nodeValue) ) {
addAttributeInElement(element, element.parentNode); addAttributeInElement( element, element.parentNode );
} }
if ( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) { if ( element.nodeType == Node.ELEMENT_NODE && element.attributes.length > 0 ) {
console.log("Element '" + element.tagName + "' has " + element.attributes.length + " attributes"); for ( iattr=0; iattr<element.attributes.length; iattr++ ){
for (iattr=0; iattr<element.attributes.length; iattr++){
var attr = element.attributes[iattr]; var attr = element.attributes[iattr];
console.log("Check attr '" + attr + "', name='" + attr.name + "'='" + attr.value + "'");
addAttributeInElement(attr, element) addAttributeInElement(attr, element)
} }
console.log("<== Element '" + element.tagName + "' had " + element.attributes.length + " attributes");
} }
} }
@ -347,7 +340,7 @@
var markdown = getMarkdownFromSlide( section ); var markdown = getMarkdownFromSlide( section );
section.innerHTML = marked( markdown ); section.innerHTML = marked( markdown );
addAttributes(section); addAttributes( section );
// If there were notes, we need to re-add them after // If there were notes, we need to re-add them after
// having overwritten the section's HTML // having overwritten the section's HTML