diff options
| author | Tomas Popela <tpopela@redhat.com> | 2014-06-30 20:33:38 +0800 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2014-06-30 20:36:24 +0800 |
| commit | 784c8fdc06b5d9204139cde8bb3bbb93832cdba2 (patch) | |
| tree | 253604dcaa6c8b3e04f1d772729925fdbe721a94 | |
| parent | bea93f95cb1ec338c3efff95407e6476996ec35d (diff) | |
| download | gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar.gz gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar.bz2 gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar.lz gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar.xz gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.tar.zst gsoc2013-evolution-784c8fdc06b5d9204139cde8bb3bbb93832cdba2.zip | |
EHTMLEditorView - Fix quoting of the lines with anchors
Remove bogus new line character insertion and don't quote the anchor
element if it has caret/selection inside.
| -rw-r--r-- | e-util/e-html-editor-view.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c index 56ec293b1a..5ca0dc0204 100644 --- a/e-util/e-html-editor-view.c +++ b/e-util/e-html-editor-view.c @@ -2794,11 +2794,6 @@ quote_node (WebKitDOMDocument *document, if (quote_level == 1 && next_sibling && WEBKIT_DOM_IS_HTML_PRE_ELEMENT (next_sibling)) return; - if (next_sibling && WEBKIT_DOM_IS_HTMLBR_ELEMENT (next_sibling) && - WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (webkit_dom_node_get_next_sibling (next_sibling))) { - insert_newline = TRUE; - } - /* Do temporary wrapper */ wrapper = webkit_dom_document_create_element (document, "SPAN", NULL); webkit_dom_element_set_class_name (wrapper, "-x-evo-temp-text-wrapper"); @@ -2961,8 +2956,10 @@ quote_plain_text_recursive (WebKitDOMDocument *document, goto next_node; } - if (webkit_dom_element_get_child_element_count (WEBKIT_DOM_ELEMENT (node)) != 0) - goto with_children; + if (!WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (node)) + if (webkit_dom_element_get_child_element_count ( + WEBKIT_DOM_ELEMENT (node)) != 0) + goto with_children; /* Even in plain text mode we can have some basic html element * like anchor and others. When Forwaring e-mail as Quoted EMFormat |