Changeset 434

Timestamp:

12/14/05 20:20:12 (14 years ago)

Author:

wymsy

Message:

Fixes: remove empty attributes;
remove leading newline added by mozilla (ref ticket #616);
remove trailing br tag added by mozilla.

File:

• trunk/plugins/GetHtml/get-html.js (modified) (3 diffs)

trunk/plugins/GetHtml/get-html.js

@@ -52 +52 @@
 /*18*/  new RegExp().compile(/(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g),//find content NOT inside pre and script tags
 /*19*/  new RegExp().compile(/(<pre[^>]*>)(\s|[^\s])*?(<\/pre>)/g),//find content inside pre tags
-/*20*/  new RegExp().compile(/(^|<!--(\s|\S)*?-->)((\s|\S)*?)(?=<!--(\s|\S)*?-->|$)/g)//find content NOT inside comments
+/*20*/  new RegExp().compile(/(^|<!--(\s|\S)*?-->)((\s|\S)*?)(?=<!--(\s|\S)*?-->|$)/g),//find content NOT inside comments
+/*21*/  new RegExp().compile(/\S*=""/g) //find empty attributes
 ];
 
@@ -65 +66 @@
                 replace(c[12], ' ').//strip contenteditable
                 replace(c[2], '="$2$4$5"$3').//add attribute quotes
+                replace(c[21], ' ').//strip empty attributes
                 replace(c[11], function(str, p1, p2) { return ' '+p1.toLowerCase()+p2; }).//lowercase attribute names
                 replace(c[3], '>').//strip singlet terminators
@@ -176 +178 @@
                 }
                 if(HTMLArea.is_gecko)
-                        html = html.replace(/(.*)<br \/>\n$/, '$1'); //strip trailing <br> added by moz
+                        html = html.replace(/(.*)<br \/>\n$/, '$1'). //strip trailing <br> added by moz
+                                replace(/^\n(.*)/, '$1'); //strip leading newline added by moz
                 if (outputRoot) {
                         html += "</" + root_tag + ">";