[evolution/wip/webkit2] EHTMLEditorView - After undoing the HISTORY_DELETE operation always re-wrap and re-quote current blo



commit aa5a2ca9cc6bb24d388d4d11dadce16902cbe14c
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Mar 2 18:10:14 2016 +0100

    EHTMLEditorView - After undoing the HISTORY_DELETE operation always re-wrap and re-quote current block

 .../composer/e-html-editor-undo-redo-manager.c     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-undo-redo-manager.c 
b/web-extensions/composer/e-html-editor-undo-redo-manager.c
index 41441ea..a2956a2 100644
--- a/web-extensions/composer/e-html-editor-undo-redo-manager.c
+++ b/web-extensions/composer/e-html-editor-undo-redo-manager.c
@@ -854,12 +854,12 @@ undo_delete (WebKitDOMDocument *document,
 
                remove_node (WEBKIT_DOM_NODE (element));
 
-               if (event->type == HISTORY_DELETE && !e_html_editor_web_extension_get_html_mode (extension) &&
-                   !webkit_dom_document_fragment_query_selector (event->data.fragment, ".-x-evo-quoted", 
NULL)) {
+               if (event->type == HISTORY_DELETE && !e_html_editor_web_extension_get_html_mode (extension)) {
                        WebKitDOMNode *current_block;
 
                        current_block = get_parent_block_node_from_child (parent);
-                       wrap_and_quote_element (document, extension, WEBKIT_DOM_ELEMENT (current_block));
+                       if (get_citation_level (current_block, FALSE) > 0)
+                               wrap_and_quote_element (document, extension, WEBKIT_DOM_ELEMENT 
(current_block));
                }
 
                /* If the selection markers are presented restore the selection,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]