Changeset 625

Timestamp:

05/24/09 23:54:19 (3 years ago)

Author:

jf.hovinne

Message:

Revert r623 and use a string replace instead. Should eventually fix #81.

Location:

trunk/src/wymeditor

Files:

• jquery.wymeditor.explorer.js (modified) (1 diff)
• jquery.wymeditor.js (modified) (4 diffs)

trunk/src/wymeditor/jquery.wymeditor.explorer.js

@@ -26 +26 @@
     this._newLine = "\r\n";
 
-    //r623 fix doesn't work in MSIE
-    wym._options.replaceBrInPreWith = false;
 };
 

trunk/src/wymeditor/jquery.wymeditor.js

@@ -347 +347 @@
 
     direction:  "ltr",
-
-    replaceBrInPreWith: '
',
 
     boxHtml:   "<div class='wym_box'>"
@@ -910 +908 @@
  */
 WYMeditor.editor.prototype.xhtml = function() {
-    if(this._options.replaceBrInPreWith)
-      jQuery('pre > br', this._doc.body).replaceWith(this._options.replaceBrInPreWith); //Fix PRE bug #81
     return this.parser.parse(this.html());
 };
@@ -3422 +3418 @@
   xhtml = this.joinRepeatedEntities(xhtml);
   xhtml = this.removeEmptyTags(xhtml);
+  xhtml = this.removeBrInPre(xhtml);
   return xhtml;
 };
@@ -3443 +3440 @@
 {
   return xhtml.replace(new RegExp('<('+this.block_tags.join("|").replace(/\|td/,'').replace(/\|th/, '')+')>(<br \/>|&#160;|&nbsp;|\\s)*<\/\\1>' ,'g'),'');
+};
+
+WYMeditor.XhtmlSaxListener.prototype.removeBrInPre = function(xhtml)
+{
+  var matches = xhtml.match(new RegExp('<pre[^>]*>(.*?)<\/pre>','gmi'));
+  for(var i=0; i<matches.length; i++) {
+    xhtml = xhtml.replace(matches[i], matches[i].replace(new RegExp('<br \/>', 'g'), String.fromCharCode(13,10)));
+  }
+  return xhtml;
 };