normalize newlines in innerHTML in firefox.

Author: mikesamuel

src/prettify.js

@@ -1228,33 +1228,33 @@ function PR_lexOne(s) {
 function prettyPrintOne(s) {
   try {
     var tokens = PR_lexOne(s);
-    var out = '';
+    var out = [];
     var lastStyle = null;
     for (var i = 0; i < tokens.length; i++) {
       var t = tokens[i];
       if (t.style != lastStyle) {
         if (lastStyle != null) {
-          out += '</span>';
+          out.push('</span>');
         }
         if (t.style != null) {
-          out += '<span class=' + t.style + '>';
+          out.push('<span class=', t.style, '>');
         }
         lastStyle = t.style;
       }
       var html = t.token;
       if (null != t.style) {
-        // This interacts badly with the wiki which introduces paragraph tags
-        // int pre blocks for some strange reason.
+        // This interacts badly with some wikis which introduces paragraph tags
+        // into pre blocks for some strange reason.
         // It's necessary for IE though which seems to lose the preformattedness
         // of <pre> tags when their innerHTML is assigned.
         html = html.replace(/(?:\r\n?)|\n/g, '<br>').replace(/  /g, '&nbsp; ');
       }
-      out += html;
+      out.push(html);
     }
     if (lastStyle != null) {
-      out += '</span>';
+      out.push('</span>');
     }
-    return out;
+    return out.join('');
   } catch (e) {
     //alert(e.stack);  // DISABLE in production
     return s;
@@ -1302,8 +1302,9 @@ function prettyPrint() {
           // XMP tags contain unescaped entities so require special handling.
           var isRawContent = 'XMP' == cs.tagName;
 
-          // fetch the content as a snippet of properly escaped HTML
-          var content = cs.innerHTML;
+          // fetch the content as a snippet of properly escaped HTML.
+          // Firefox adds newlines at the end.
+          var content = cs.innerHTML.replace(/(?:\r\n?|\n)$/, '');
           if (isRawContent) {
             content = PR_textToHtml(content);
           }

tests/prettify_test.html

@@ -327,8 +327,7 @@ <h1>HTML using XMP</h1>
       '&nbsp; echo `END`PUN-`END`PLNn $a<br>' +
       '`END`PUN}`END`PLN<br>' +
       '<br>' +
-      'fib `END`LIT10`END`PLN<br>' +
-      '`END'),
+      'fib `END`LIT10`END'),
 
   C: (
       '`COM#include &lt;stdio.h&gt;`END`PLN<br>' +
@@ -355,8 +354,7 @@ <h1>HTML using XMP</h1>
       'main`END`PUN()`END`PLN `END`PUN{`END`PLN<br>' +
       '&nbsp; printf`END`PUN(`END`STR"%u"`END`PUN,`END`PLN fib`END`PUN(`END' +
           '`LIT10`END`PUN));`END`PLN<br>' +
-      '`END`PUN}`END`PLN<br>' +
-      '`END'),
+      '`END`PUN}`END'),
 
   Cpp: (
       '`COM#include &lt;iostream&gt;`END`PLN<br>' +
@@ -390,8 +388,7 @@ <h1>HTML using XMP</h1>
           '`PUN)`END`PLN `END`PUN{`END`PLN<br>' +
       '&nbsp; cout `END&lt;&lt;`PLN fib`END`PUN(`END`LIT10`END`PUN,`END' +
           '`PLN `END`LIT1U`END`PUN);`END`PLN<br>' +
-      '`END`PUN}`END`PLN<br>' +
-      '`END'),
+      '`END`PUN}`END'),
 
   java: (
       '`KWDpackage`END`PLN foo`END`PUN;`END`PLN<br>' +
@@ -474,8 +471,7 @@ <h1>HTML using XMP</h1>
           '`PLN `END`KWDnew`END`PLN `END`TYPFibonacci`END`PUN()));`END' +
           '`PLN<br>' +
       '&nbsp; `END`PUN}`END`PLN<br>' +
-      '`END`PUN}`END`PLN<br>' +
-      '`END'),
+      '`END`PUN}`END'),
   javascript: (
       '`COM/**<br>' +
       ' * nth element in the fibonacci series.<br>' +
@@ -497,8 +493,7 @@ <h1>HTML using XMP</h1>
       '`END`PUN}`END`PLN<br>' +
       '<br>' +
       'document`END`PUN.`END`PLNwrite`END`PUN(`END`PLNfib`END`PUN(`END' +
-          '`LIT10`END`PUN));`END`PLN<br>' +
-      '`END'),
+          '`LIT10`END`PUN));`END'),
   perl: (
       '`COM#!/usr/bin/perl`END`PLN<br>' +
       '<br>' +
@@ -521,8 +516,7 @@ <h1>HTML using XMP</h1>
       '&nbsp; `END`KWDreturn`END`PLN $a`END`PUN;`END`PLN<br>' +
       '`END`PUN}`END`PLN<br>' +
       '<br>' +
-      '`END`KWDprint`END`PLN fib`END`PUN(`END`LIT10`END`PUN);`END`PLN<br>' +
-      '`END'),
+      '`END`KWDprint`END`PLN fib`END`PUN(`END`LIT10`END`PUN);`END'),
   python: (
       '`COM#!/usr/bin/python2.4`END`PLN<br>' +
       '<br>' +
@@ -554,8 +548,7 @@ <h1>HTML using XMP</h1>
           '`LIT0`END`PUN:`END`PLN `END`KWDreturn`END`PLN x<br>' +
       '<br>' +
       '`END`KWDprint`END`PLN nth`END`PUN(`END`PLNfib`END`PUN(),`END`PLN `END' +
-          '`LIT10`END`PUN)`END`PLN<br>' +
-      '`END'),
+          '`LIT10`END`PUN)`END'),
   xml: (
       '`DEC&lt;!DOCTYPE series PUBLIC "fibonacci numbers"&gt;`END`PLN<br>' +
       '<br>' +
@@ -575,8 +568,7 @@ <h1>HTML using XMP</h1>
       '&nbsp; `END`TAG&lt;element `END`ATNi`END`TAG=`END`ATV"5"`END' +
           '`TAG&gt;`END`PLN8`END`TAG&lt;/element&gt;`END`PLN<br>' +
       '&nbsp; ...<br>' +
-      '`END`TAG&lt;/series&gt;`END`PLN<br>' +
-      '`END'),
+      '`END`TAG&lt;/series&gt;`END'),
   html: (
       '`TAG&lt;html&gt;`END`PLN<br>' +
       '&nbsp; `END`TAG&lt;head&gt;`END`PLN<br>' +
@@ -626,8 +618,7 @@ <h1>HTML using XMP</h1>
       '`END`COM// --&gt;`END`PLN<br>' +
       '&nbsp; &nbsp; `END`END`TAG&lt;/script&gt;`END`PLN<br>' +
       '&nbsp; `END`TAG&lt;/body&gt;`END`PLN<br>' +
-      '`END`TAG&lt;/html&gt;`END`PLN<br>' +
-      '`END'),
+      '`END`TAG&lt;/html&gt;`END'),
   htmlXmp: (
       '`TAG&lt;html&gt;`END`PLN<br>' +
       '&nbsp; `END`TAG&lt;head&gt;`END`PLN<br>' +
@@ -677,8 +668,7 @@ <h1>HTML using XMP</h1>
       '`END`COM// --&gt;`END`PLN<br>' +
       '&nbsp; &nbsp; `END`END`TAG&lt;/script&gt;`END`PLN<br>' +
       '&nbsp; `END`TAG&lt;/body&gt;`END`PLN<br>' +
-      '`END`TAG&lt;/html&gt;`END`PLN<br>' +
-      '`END')
+      '`END`TAG&lt;/html&gt;`END')
 };