Changeset 1167


Ignore:
Timestamp:
02/17/09 20:21:45 (10 years ago)
Author:
ray
Message:

#1394 fullpage puts metas/ title all on the same line

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/XinhaCore.js

    r1163 r1167  
    60896089Xinha._blockTags = " body form textarea fieldset ul ol dl li div " + 
    60906090"p h1 h2 h3 h4 h5 h6 quote pre table thead " + 
    6091 "tbody tfoot tr td th iframe address blockquote "; 
     6091"tbody tfoot tr td th iframe address blockquote title meta link style head "; 
    60926092 
    60936093/** Checks if one element is in the list of elements that are defined as block level elements in HTML 
     
    61066106 *  @type {String} 
    61076107 */ 
    6108 Xinha._paraContainerTags = " body td th caption fieldset div"; 
     6108Xinha._paraContainerTags = " body td th caption fieldset div "; 
    61096109/** Checks if one element is in the list of elements that are allowed to contain a paragraph in HTML 
    61106110 *   
  • trunk/modules/GetHtml/DOMwalk.js

    r1154 r1167  
    110110        RegExp.multiline = true; 
    111111        var txt =  
    112         root.innerHTML.replace(Xinha.RE_tagName, function(str, p1, p2) { return p1 + p2.toLowerCase(); }) // lowercasize 
     112        root.innerHTML 
     113        .replace(Xinha.RE_tagName, function(str, p1, p2) { return p1 + p2.toLowerCase(); }) // lowercasize 
    113114        .replace(/\s*=\s*(([^'"][^>\s]*)([>\s])|"([^"]+)"|'([^']+)')/g, '="$2$4$5"$3') //add attribute quotes 
    114         .replace(/<(link|meta)((\s*\S*="[^"]*")*)>/g, '<$1$2 />'); //terminate singlet tags 
     115        .replace(/<(link|meta)((\s*\S*="[^"]*")*)>([\n\r]*)/g, '<$1$2 />\n'); //terminate singlet tags 
    115116        RegExp.multiline = save_multiline; 
    116117        html += txt + '\n'; 
Note: See TracChangeset for help on using the changeset viewer.