[evolution/gnome-3-16] EHTMLEditorSelection - Improve history selection saving on various places

[Tomas Popela <tpopela src gnome org>]

commit 41cb54588ff6070a9df74a02c9818b6cb2a0aba8
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Apr 9 16:40:57 2015 +0200

    EHTMLEditorSelection - Improve history selection saving on various places
    
    On some places save the selection coordinates after the selection is saved to
    avoid another e_html_editor_selection_save call. Also on some places
    save the selection coordinates after we are sure that they are really there.

 e-util/e-html-editor-selection.c |  107 +++++++++++++++++++-------------------
 1 files changed, 54 insertions(+), 53 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index bd9bd46..d3768c5 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -1569,6 +1569,16 @@ e_html_editor_selection_set_alignment (EHTMLEditorSelection *selection,
 
        e_html_editor_selection_save (selection);
 
+       selection_start_marker = webkit_dom_document_query_selector (
+               document, "span#-x-evo-selection-start-marker", NULL);
+       selection_end_marker = webkit_dom_document_query_selector (
+               document, "span#-x-evo-selection-end-marker", NULL);
+
+       if (!selection_start_marker) {
+               g_object_unref (view);
+               return;
+       }
+
        if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
                ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
                ev->type = HISTORY_ALIGNMENT;
@@ -1583,16 +1593,6 @@ e_html_editor_selection_set_alignment (EHTMLEditorSelection *selection,
                ev->data.style.to = alignment;
        }
 
-       selection_start_marker = webkit_dom_document_query_selector (
-               document, "span#-x-evo-selection-start-marker", NULL);
-       selection_end_marker = webkit_dom_document_query_selector (
-               document, "span#-x-evo-selection-end-marker", NULL);
-
-       if (!selection_start_marker) {
-               g_object_unref (view);
-               return;
-       }
-
        block = get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
@@ -3512,20 +3512,6 @@ e_html_editor_selection_indent (EHTMLEditorSelection *selection)
 
        e_html_editor_selection_save (selection);
 
-       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
-               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
-               ev->type = HISTORY_INDENT;
-
-               e_html_editor_selection_get_selection_coordinates (
-                       selection,
-                       &ev->before.start.x,
-                       &ev->before.start.y,
-                       &ev->before.end.x,
-                       &ev->before.end.y);
-               ev->data.style.from = 1;
-               ev->data.style.to = 1;
-       }
-
        selection_start_marker = webkit_dom_document_query_selector (
                document, "span#-x-evo-selection-start-marker", NULL);
 
@@ -3547,6 +3533,20 @@ e_html_editor_selection_indent (EHTMLEditorSelection *selection)
                        &selection_end_marker);
        }
 
+       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
+               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
+               ev->type = HISTORY_INDENT;
+
+               e_html_editor_selection_get_selection_coordinates (
+                       selection,
+                       &ev->before.start.x,
+                       &ev->before.start.y,
+                       &ev->before.end.x,
+                       &ev->before.end.y);
+               ev->data.style.from = 1;
+               ev->data.style.to = 1;
+       }
+
        block = get_parent_indented_block (
                WEBKIT_DOM_NODE (selection_start_marker));
        if (!block)
@@ -3868,18 +3868,6 @@ e_html_editor_selection_unindent (EHTMLEditorSelection *selection)
        view = e_html_editor_selection_ref_html_editor_view (selection);
        g_return_if_fail (view != NULL);
 
-       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
-               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
-               ev->type = HISTORY_INDENT;
-
-               e_html_editor_selection_get_selection_coordinates (
-                       selection,
-                       &ev->before.start.x,
-                       &ev->before.start.y,
-                       &ev->before.end.x,
-                       &ev->before.end.y);
-       }
-
        document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
 
        e_html_editor_selection_save (selection);
@@ -3904,6 +3892,18 @@ e_html_editor_selection_unindent (EHTMLEditorSelection *selection)
                        &selection_end_marker);
        }
 
+       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
+               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
+               ev->type = HISTORY_INDENT;
+
+               e_html_editor_selection_get_selection_coordinates (
+                       selection,
+                       &ev->before.start.x,
+                       &ev->before.start.y,
+                       &ev->before.end.x,
+                       &ev->before.end.y);
+       }
+
        block = get_parent_indented_block (
                WEBKIT_DOM_NODE (selection_start_marker));
        if (!block)
@@ -4140,6 +4140,7 @@ html_editor_selection_set_font_style (EHTMLEditorSelection *selection,
 
        g_object_unref (view);
 }
+
 /**
  * e_html_editor_selection_set_bold:
  * @selection: an #EHTMLEditorSelection
@@ -5340,9 +5341,6 @@ insert_base64_image (EHTMLEditorSelection *selection,
                WEBKIT_DOM_NODE (selection_start_marker),
                NULL);
 
-       e_html_editor_selection_restore (selection);
-       e_html_editor_view_force_spell_check_for_current_paragraph (view);
-
        if (ev) {
                WebKitDOMDocumentFragment *fragment;
                WebKitDOMNode *node;
@@ -5364,6 +5362,9 @@ insert_base64_image (EHTMLEditorSelection *selection,
                e_html_editor_view_insert_new_history_event (view, ev);
        }
 
+       e_html_editor_selection_restore (selection);
+       e_html_editor_view_force_spell_check_for_current_paragraph (view);
+
        g_object_unref (view);
 }
 
@@ -6330,20 +6331,6 @@ e_html_editor_selection_wrap_lines (EHTMLEditorSelection *selection)
 
        e_html_editor_selection_save (selection);
 
-       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
-               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
-               ev->type = HISTORY_WRAP;
-
-               e_html_editor_selection_get_selection_coordinates (
-                       selection,
-                       &ev->before.start.x,
-                       &ev->before.start.y,
-                       &ev->before.end.x,
-                       &ev->before.end.y);
-               ev->data.style.from = 1;
-               ev->data.style.to = 1;
-       }
-
        selection_start_marker = webkit_dom_document_query_selector (
                document, "span#-x-evo-selection-start-marker", NULL);
        selection_end_marker = webkit_dom_document_query_selector (
@@ -6364,6 +6351,20 @@ e_html_editor_selection_wrap_lines (EHTMLEditorSelection *selection)
                        &selection_end_marker);
        }
 
+       if (!e_html_editor_view_is_undo_redo_in_progress (view)) {
+               ev = g_new0 (EHTMLEditorViewHistoryEvent, 1);
+               ev->type = HISTORY_WRAP;
+
+               e_html_editor_selection_get_selection_coordinates (
+                       selection,
+                       &ev->before.start.x,
+                       &ev->before.start.y,
+                       &ev->before.end.x,
+                       &ev->before.end.y);
+               ev->data.style.from = 1;
+               ev->data.style.to = 1;
+       }
+
        block = get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));