diff options
author | Tomas Popela <tpopela@redhat.com> | 2014-08-07 17:33:51 +0800 |
---|---|---|
committer | Tomas Popela <tpopela@redhat.com> | 2014-08-07 17:33:51 +0800 |
commit | ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4 (patch) | |
tree | 103f5340ce10646992f387987d9579fa8f5ecbf2 | |
parent | 45fa23472760037a94f00873538da91b1ae65b7f (diff) | |
download | gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar.gz gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar.bz2 gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar.lz gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar.xz gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.tar.zst gsoc2013-evolution-ed8e9ec9fec8b32c17b4cb51a9052751cb5d74b4.zip |
EHTMLEditorSelection - Remove just the BR elements that are used for the wrapping unless it is forced
-rw-r--r-- | e-util/e-html-editor-selection.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c index 86f96ce971..ee9937fa7b 100644 --- a/e-util/e-html-editor-selection.c +++ b/e-util/e-html-editor-selection.c @@ -5090,8 +5090,12 @@ wrap_lines (EHTMLEditorSelection *selection, while (nd) { WebKitDOMNode *next_nd = webkit_dom_node_get_next_sibling (nd); - if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (nd)) - remove_node (nd); + if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (nd)) { + if (remove_all_br) + remove_node (nd); + else if (element_has_class (WEBKIT_DOM_ELEMENT (nd), "-x-evo-wrap-br")) + remove_node (nd); + } nd = next_nd; } } |