From a0c4134699f556eadc9975c7019a7354eb39ea69 Mon Sep 17 00:00:00 2001
From: flyskyko
Date: Thu, 8 Mar 2012 07:40:45 +0000
Subject: [PATCH] issue 1185, trim iframe body after init, add new line after
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10396 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
.../skins/xpresseditor/js/Xpress_Editor.js | 4 ++
.../skins/xpresseditor/js/xe_interface.js | 3 +-
.../skins/xpresseditor/js/xpresseditor.js | 7 ++-
.../skins/xpresseditor/js/xpresseditor.min.js | 55 ++++++++++---------
4 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
index ee3930e74..d4d9e33c5 100644
--- a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
+++ b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
@@ -5247,6 +5247,10 @@ xe.XE_XHTMLFormatter = $.Class({
}
+ // add new line after
+ regex = /<\/p>[ \t]*(\n)?/ig;
+ sContent = sContent.replace(regex, "\n");
+
return sContent;
},
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index d48aee5f0..e2b97cc0a 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -11,7 +11,7 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height
var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
var textarea = jQuery("#xpress-editor-"+editor_sequence);
- var iframe = jQuery('