[evolution/wip/webkit2] EHTMLEditorView - Block is wrongly preserved in the beginning of quoted content
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] EHTMLEditorView - Block is wrongly preserved in the beginning of quoted content
- Date: Wed, 22 Apr 2015 13:05:51 +0000 (UTC)
commit 02a7bb1b3090dcb66490688fff86219f40ccede5
Author: Tomas Popela <tpopela redhat com>
Date: Thu Mar 26 13:44:03 2015 +0100
EHTMLEditorView - Block is wrongly preserved in the beginning of quoted content
web-extensions/e-html-editor-view-dom-functions.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/web-extensions/e-html-editor-view-dom-functions.c
b/web-extensions/e-html-editor-view-dom-functions.c
index 1e9ce4e..d18f1eb 100644
--- a/web-extensions/e-html-editor-view-dom-functions.c
+++ b/web-extensions/e-html-editor-view-dom-functions.c
@@ -3344,8 +3344,10 @@ parse_html_into_paragraphs (WebKitDOMDocument *document,
rest = with_br ?
to_insert + 4 + (with_br - to_insert) : to_insert;
- if (!rest)
+ if (!rest) {
+ preserve_next_line = FALSE;
goto next;
+ }
if (*rest) {
gboolean empty = FALSE;
@@ -3355,7 +3357,7 @@ parse_html_into_paragraphs (WebKitDOMDocument *document,
g_strchomp (truncated);
empty = !*truncated && strlen (rest) > 0;
- if (strchr (" +- *=\t", *rest))
+ if (strchr (" +- *=\t;#", *rest))
preserve_block = FALSE;
rest_to_insert = g_regex_replace_eval (
@@ -3475,8 +3477,10 @@ parse_html_into_paragraphs (WebKitDOMDocument *document,
blockquote,
block,
"<br class=\"-x-evo-first-br\">");
- }
- }
+ } else
+ preserve_next_line = FALSE;
+ } else
+ preserve_next_line = FALSE;
next:
first_element = FALSE;
prev_br = next_br;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]