Changeset 2592:5edbd7c3d2d7

Timestamp:

11/26/13 22:35:27 (12 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

2.6

Message:

Backport fix for issue #1454

Files:

• admin/js/jsToolBar/jsToolBar.wysiwyg.js (modified) (1 diff)
• themes/ductile/style.css (modified) (1 diff)

admin/js/jsToolBar/jsToolBar.wysiwyg.js

@@ -527 +527 @@
      html = html.replace(/\r\n/g,"\n");
 
-     /* Trim */
-     html = html.replace(/^\s+/gm,'');
-     html = html.replace(/\s+$/gm,'');
+     /* Trim only if there's no pre tag */
+     pattern_pre = /<pre>[\s\S]*<\/pre>/gi;
+     if (!pattern_pre.test(html)) {
+          html = html.replace(/^\s+/gm,'');
+          html = html.replace(/\s+$/gm,'');
+     }
 
      return html;

themes/ductile/style.css

@@ -67 +67 @@
      border-bottom: 1px solid #aaa;
      font-size: .81em;
-     }
-pre {
-     white-space: normal;
      }
 a {