[evolution/wip/webkit2] EHTMLEditorView - It's not possible to change formatting from Blockquote to list

[Milan Crha <mcrha src gnome org>]

commit 8360c8d8014edeca6be369193a36408888bb9a4d
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Mar 3 14:48:51 2016 +0100

    EHTMLEditorView - It's not possible to change formatting from Blockquote to list

 .../e-html-editor-selection-dom-functions.c        |    6 ++++++
 .../composer/e-html-editor-view-dom-functions.c    |    8 +++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/web-extensions/composer/e-html-editor-selection-dom-functions.c 
b/web-extensions/composer/e-html-editor-selection-dom-functions.c
index f869bca..290c8c6 100644
--- a/web-extensions/composer/e-html-editor-selection-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-selection-dom-functions.c
@@ -5322,9 +5322,15 @@ format_change_block_to_list (WebKitDOMDocument *document,
                g_object_unref (dom_selection);
                g_object_unref (dom_window);
 
+               dom_remove_input_event_listener_from_body (document, extension);
+               e_html_editor_web_extension_block_selection_changed_callback (extension);
+
                dom_exec_command (
                        document, extension, E_HTML_EDITOR_VIEW_COMMAND_INSERT_NEW_LINE_IN_QUOTED_CONTENT, 
NULL);
 
+               dom_register_input_event_listener_on_body (document, extension);
+               e_html_editor_web_extension_unblock_selection_changed_callback (extension);
+
                element = webkit_dom_document_query_selector (
                        document, "body>br", NULL);
 
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.c 
b/web-extensions/composer/e-html-editor-view-dom-functions.c
index 1237b0b..7ae7c33 100644
--- a/web-extensions/composer/e-html-editor-view-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-view-dom-functions.c
@@ -700,9 +700,15 @@ dom_insert_new_line_into_citation (WebKitDOMDocument *document,
 
                return NULL;
        } else {
+               dom_remove_input_event_listener_from_body (document, extension);
+               e_html_editor_web_extension_block_selection_changed_callback (extension);
+
                ret_val = dom_exec_command (
                        document, extension, E_HTML_EDITOR_VIEW_COMMAND_INSERT_NEW_LINE_IN_QUOTED_CONTENT, 
NULL);
 
+               e_html_editor_web_extension_unblock_selection_changed_callback (extension);
+               dom_register_input_event_listener_on_body (document, extension);
+
                if (!ret_val)
                        return NULL;
 
@@ -5124,7 +5130,7 @@ dom_convert_content (WebKitDOMDocument *document,
        g_object_unref (list);
 
        repair_gmail_blockquotes (document);
-       create_text_markers_for_citations_in_document (document);
+       create_text_markers_for_citations_in_element (WEBKIT_DOM_ELEMENT (body));
 
        if (preferred_text && *preferred_text)
                webkit_dom_html_element_set_inner_text (