GNOME.org
 

[evolution] EHTMLEditorSelection - Wrong block format detected in HTML mode

commit a6883d4381671e27ba0f2fd29809b701dd96815b
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Jul 22 15:51:22 2015 +0200

    EHTMLEditorSelection - Wrong block format detected in HTML mode
    
    If we have an empty block (DIV element with just BR element inside) inside a
    BLOCKQUOTE then the 'Blockquote' format is detected instead of 'Normal' as we
    were getting a wrong node for inspection.

 e-util/e-html-editor-selection.c |   74 ++++++++++---------------------------
 e-util/e-html-editor-utils.c     |   40 ++++++++++++++++++++
 e-util/e-html-editor-utils.h     |    6 +++
 e-util/e-html-editor-view.c      |   71 ++++++++++--------------------------
 4 files changed, 85 insertions(+), 106 deletions(-)
---
diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c
index b4d7f7d..5339afb 100644
--- a/e-util/e-html-editor-selection.c
+++ b/e-util/e-html-editor-selection.c
@@ -1673,27 +1673,6 @@ set_block_alignment (WebKitDOMElement *element,
        }
 }
 
-static WebKitDOMNode *
-get_parent_block_node_from_child (WebKitDOMNode *node)
-{
-       WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node);
-
-       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") ||
-           WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u"))
-               parent = webkit_dom_node_get_parent_node (parent);
-
-       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted"))
-               parent = webkit_dom_node_get_parent_node (parent);
-
-       return parent;
-}
-
 void
 e_html_editor_selection_get_selection_coordinates (EHTMLEditorSelection *selection,
                                                    guint *start_x,
@@ -1847,7 +1826,7 @@ e_html_editor_selection_set_alignment (EHTMLEditorSelection *selection,
                ev->data.style.to = alignment;
        }
 
-       block = get_parent_block_node_from_child (
+       block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
        while (block && !after_selection_end) {
@@ -2007,7 +1986,7 @@ get_block_node (WebKitDOMRange *range)
        WebKitDOMNode *node;
 
        node = webkit_dom_range_get_common_ancestor_container (range, NULL);
-       node = get_parent_block_node_from_child (node);
+       node = e_html_editor_get_parent_block_node_from_child (node);
 
        return node;
 }
@@ -2123,7 +2102,8 @@ e_html_editor_selection_get_block_format (EHTMLEditorSelection *selection)
                else {
                        WebKitDOMNode *block = get_block_node (range);
 
-                       if (element_has_class (WEBKIT_DOM_ELEMENT (block), "-x-evo-paragraph"))
+                       if (WEBKIT_DOM_IS_HTML_DIV_ELEMENT (block) ||
+                           element_has_class (WEBKIT_DOM_ELEMENT (block), "-x-evo-paragraph"))
                                result = E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH;
                        else {
                                /* Paragraphs inside quote */
@@ -2147,20 +2127,6 @@ e_html_editor_selection_get_block_format (EHTMLEditorSelection *selection)
        return result;
 }
 
-static gboolean
-is_selection_position_node (WebKitDOMNode *node)
-{
-       WebKitDOMElement *element;
-
-       if (!node || !WEBKIT_DOM_IS_ELEMENT (node))
-               return FALSE;
-
-       element = WEBKIT_DOM_ELEMENT (node);
-
-       return element_has_id (element, "-x-evo-selection-start-marker") ||
-              element_has_id (element, "-x-evo-selection-end-marker");
-}
-
 void
 remove_wrapping_from_element (WebKitDOMElement *element)
 {
@@ -2174,7 +2140,7 @@ remove_wrapping_from_element (WebKitDOMElement *element)
                WebKitDOMNode *node = webkit_dom_node_list_item (list, ii);
                WebKitDOMNode *parent;
 
-               parent = get_parent_block_node_from_child (node);
+               parent = e_html_editor_get_parent_block_node_from_child (node);
                if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (parent), "data-user-wrapped"))
                        remove_node (node);
                g_object_unref (node);
@@ -2189,7 +2155,7 @@ remove_wrapping_from_element (WebKitDOMElement *element)
                WebKitDOMNode *parent;
 
                hidden_space_node = webkit_dom_node_list_item (list, ii);
-               parent = get_parent_block_node_from_child (hidden_space_node);
+               parent = e_html_editor_get_parent_block_node_from_child (hidden_space_node);
                if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (parent), "data-user-wrapped")) {
                        webkit_dom_html_element_set_outer_text (
                                WEBKIT_DOM_HTML_ELEMENT (hidden_space_node), " ", NULL);
@@ -2823,7 +2789,7 @@ format_change_block_to_block (EHTMLEditorSelection *selection,
                        &selection_end_marker);
        }
 
-       block = get_parent_block_node_from_child (
+       block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
        html_mode = e_html_editor_view_get_html_mode (view);
@@ -2843,7 +2809,7 @@ format_change_block_to_block (EHTMLEditorSelection *selection,
                        NULL);
        }
 
-       end_block = get_parent_block_node_from_child (
+       end_block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_end_marker));
 
        /* Process all blocks that are in the selection one by one */
@@ -2882,7 +2848,7 @@ format_change_block_to_list (EHTMLEditorSelection *selection,
                        &selection_end_marker);
        }
 
-       block = get_parent_block_node_from_child (
+       block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
        list = create_list_element (selection, document, format, 0, html_mode);
@@ -2921,7 +2887,7 @@ format_change_block_to_list (EHTMLEditorSelection *selection,
                        WEBKIT_DOM_NODE (element),
                        NULL);
 
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
        } else
                webkit_dom_node_insert_before (
@@ -3202,9 +3168,9 @@ e_html_editor_selection_set_block_format (EHTMLEditorSelection *selection,
                                document, "-x-evo-selection-start-marker");
                        selection_end_marker = webkit_dom_document_get_element_by_id (
                                document, "-x-evo-selection-end-marker");
-                       block = get_parent_block_node_from_child (
+                       block = e_html_editor_get_parent_block_node_from_child (
                                WEBKIT_DOM_NODE (selection_start_marker));
-                       end_block = get_parent_block_node_from_child (
+                       end_block = e_html_editor_get_parent_block_node_from_child (
                                WEBKIT_DOM_NODE (selection_end_marker));
                        if (webkit_dom_range_get_collapsed (range, NULL) ||
                            webkit_dom_node_is_same_node (block, end_block)) {
@@ -3853,7 +3819,7 @@ indent_list (EHTMLEditorSelection *selection,
        selection_end_marker = webkit_dom_document_query_selector (
                document, "span#-x-evo-selection-end-marker", NULL);
 
-       item = get_parent_block_node_from_child (
+       item = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
        if (WEBKIT_DOM_IS_HTMLLI_ELEMENT (item)) {
@@ -3953,7 +3919,7 @@ e_html_editor_selection_indent (EHTMLEditorSelection *selection)
        block = get_parent_indented_block (
                WEBKIT_DOM_NODE (selection_start_marker));
        if (!block)
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
 
        while (block && !after_selection_end) {
@@ -4099,7 +4065,7 @@ unindent_list (EHTMLEditorSelection *selection,
                return;
 
        /* Copy elements from previous block to list */
-       item = get_parent_block_node_from_child (
+       item = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
        source_list = webkit_dom_node_get_parent_node (item);
        new_list = WEBKIT_DOM_ELEMENT (
@@ -4314,7 +4280,7 @@ e_html_editor_selection_unindent (EHTMLEditorSelection *selection)
        block = get_parent_indented_block (
                WEBKIT_DOM_NODE (selection_start_marker));
        if (!block)
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
 
        while (block && !after_selection_end) {
@@ -6632,7 +6598,7 @@ wrap_lines (EHTMLEditorSelection *selection,
                        }
                        g_free (text_content);
                } else {
-                       if (is_selection_position_node (node)) {
+                       if (e_html_editor_node_is_selection_position_node (node)) {
                                node = webkit_dom_node_get_next_sibling (node);
                                continue;
                        }
@@ -7073,7 +7039,7 @@ e_html_editor_selection_wrap_lines (EHTMLEditorSelection *selection)
                ev->data.style.to = 1;
        }
 
-       block = get_parent_block_node_from_child (
+       block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
 
        html_mode = e_html_editor_view_get_html_mode (view);
@@ -7690,7 +7656,7 @@ e_html_editor_selection_restore (EHTMLEditorSelection *selection)
                selection_start_marker =
                        webkit_dom_node_get_next_sibling (selection_start_marker);
 
-               ok = is_selection_position_node (selection_start_marker);
+               ok = e_html_editor_node_is_selection_position_node (selection_start_marker);
 
                if (ok) {
                        ok = FALSE;
@@ -7698,7 +7664,7 @@ e_html_editor_selection_restore (EHTMLEditorSelection *selection)
                                selection_end_marker = webkit_dom_node_get_next_sibling (
                                        selection_start_marker);
 
-                               ok = is_selection_position_node (selection_end_marker);
+                               ok = e_html_editor_node_is_selection_position_node (selection_end_marker);
                                if (ok) {
                                        parent_start = webkit_dom_node_get_parent_node (selection_end_marker);
 
diff --git a/e-util/e-html-editor-utils.c b/e-util/e-html-editor-utils.c
index 2807ea9..76caf9c 100644
--- a/e-util/e-html-editor-utils.c
+++ b/e-util/e-html-editor-utils.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "e-html-editor-utils.h"
+#include "e-web-view.h"
 #include <string.h>
 
 /**
@@ -114,3 +115,42 @@ e_html_editor_dom_node_find_child_element (WebKitDOMNode *node,
 
        return NULL;
 }
+
+gboolean
+e_html_editor_node_is_selection_position_node (WebKitDOMNode *node)
+{
+       WebKitDOMElement *element;
+
+       if (!node || !WEBKIT_DOM_IS_ELEMENT (node))
+               return FALSE;
+
+       element = WEBKIT_DOM_ELEMENT (node);
+
+       return element_has_id (element, "-x-evo-selection-start-marker") ||
+              element_has_id (element, "-x-evo-selection-end-marker");
+}
+
+WebKitDOMNode *
+e_html_editor_get_parent_block_node_from_child (WebKitDOMNode *node)
+{
+       WebKitDOMNode *parent = node;
+
+       if (!WEBKIT_DOM_IS_ELEMENT (parent) ||
+           e_html_editor_node_is_selection_position_node (parent))
+               parent = webkit_dom_node_get_parent_node (parent);
+
+       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") ||
+           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") ||
+           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") ||
+           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") ||
+           WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) ||
+           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") ||
+           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") ||
+           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u"))
+               parent = webkit_dom_node_get_parent_node (parent);
+
+       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted"))
+               parent = webkit_dom_node_get_parent_node (parent);
+
+       return parent;
+}
diff --git a/e-util/e-html-editor-utils.h b/e-util/e-html-editor-utils.h
index 7331a87..40a934f 100644
--- a/e-util/e-html-editor-utils.h
+++ b/e-util/e-html-editor-utils.h
@@ -39,6 +39,12 @@ WebKitDOMElement *
                                                (WebKitDOMNode *node,
                                                 const gchar *tagname);
 
+gboolean       e_html_editor_node_is_selection_position_node
+                                               (WebKitDOMNode *node);
+
+WebKitDOMNode *        e_html_editor_get_parent_block_node_from_child
+                                               (WebKitDOMNode *node);
+
 G_END_DECLS
 
 #endif /* E_HTML_EDITOR_UTILS_H */
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 428b44e..e09ff41 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -1015,27 +1015,6 @@ return_pressed_in_empty_line (EHTMLEditorSelection *selection,
        return FALSE;
 }
 
-static WebKitDOMNode *
-get_parent_block_node_from_child (WebKitDOMNode *node)
-{
-       WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node);
-
-       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") ||
-           element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") ||
-           WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") ||
-           element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u"))
-               parent = webkit_dom_node_get_parent_node (parent);
-
-       if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted"))
-               parent = webkit_dom_node_get_parent_node (parent);
-
-       return parent;
-}
-
 static WebKitDOMElement *
 prepare_paragraph (EHTMLEditorSelection *selection,
                    WebKitDOMDocument *document,
@@ -1084,7 +1063,7 @@ insert_new_line_into_citation (EHTMLEditorView *view,
                selection_start_marker = webkit_dom_document_get_element_by_id (
                        document, "-x-evo-selection-start-marker");
 
-               current_block = get_parent_block_node_from_child (
+               current_block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
 
                block_clone = webkit_dom_node_clone_node (current_block, TRUE);
@@ -1992,7 +1971,7 @@ emoticon_insert_span (EHTMLEditorView *view,
        }
 
        /* Sometimes selection end marker is in body. Move it into next sibling */
-       selection_end_marker_parent = get_parent_block_node_from_child (
+       selection_end_marker_parent = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_end_marker));
        if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (selection_end_marker_parent)) {
                webkit_dom_node_insert_before (
@@ -3326,7 +3305,7 @@ body_keyup_event_cb (WebKitDOMElement *element,
                            !webkit_dom_node_get_previous_sibling (prev_sibling))) {
                                WebKitDOMElement *block;
 
-                               block = WEBKIT_DOM_ELEMENT (get_parent_block_node_from_child (
+                               block = WEBKIT_DOM_ELEMENT (e_html_editor_get_parent_block_node_from_child (
                                        WEBKIT_DOM_NODE (selection_start_marker)));
                                if (webkit_dom_element_has_attribute (block, "data-no-quote")) {
                                        webkit_dom_element_remove_attribute (block, "data-no-quote");
@@ -3349,7 +3328,7 @@ body_keyup_event_cb (WebKitDOMElement *element,
                        WebKitDOMDocumentFragment *fragment;
                        WebKitDOMNode *block;
 
-                       block = get_parent_block_node_from_child (
+                       block = e_html_editor_get_parent_block_node_from_child (
                                WEBKIT_DOM_NODE (selection_start_marker));
 
                        remove_selection_markers (document);
@@ -3977,7 +3956,7 @@ change_quoted_block_to_normal (EHTMLEditorView *view)
        if (!selection_start_marker || !selection_end_marker)
                return FALSE;
 
-       block = WEBKIT_DOM_ELEMENT (get_parent_block_node_from_child (
+       block = WEBKIT_DOM_ELEMENT (e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker)));
 
        citation_level = get_citation_level (
@@ -4470,7 +4449,7 @@ fix_structure_after_delete_before_quoted_content (EHTMLEditorView *view,
        if (collapsed) {
                WebKitDOMNode *next_sibling;
 
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
 
                next_sibling = webkit_dom_node_get_next_sibling (block);
@@ -4530,9 +4509,9 @@ fix_structure_after_delete_before_quoted_content (EHTMLEditorView *view,
                        WEBKIT_DOM_NODE (node),
                        NULL);
 
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
-               end_block = get_parent_block_node_from_child (
+               end_block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_end_marker));
 
                /* Situation where the start of the selection is in the beginning
@@ -5670,25 +5649,13 @@ insert_quote_symbols_before_node (WebKitDOMDocument *document,
 }
 
 static gboolean
-element_is_selection_marker (WebKitDOMElement *element)
-{
-       gboolean is_marker = FALSE;
-
-       is_marker =
-               element_has_id (element, "-x-evo-selection-start-marker") ||
-               element_has_id (element, "-x-evo-selection-end-marker");
-
-       return is_marker;
-}
-
-static gboolean
 check_if_suppress_next_node (WebKitDOMNode *node)
 {
        if (!node)
                return FALSE;
 
        if (node && WEBKIT_DOM_IS_ELEMENT (node))
-               if (element_is_selection_marker (WEBKIT_DOM_ELEMENT (node)))
+               if (e_html_editor_node_is_selection_position_node (node))
                        if (!webkit_dom_node_get_previous_sibling (node))
                                return FALSE;
 
@@ -5770,7 +5737,7 @@ quote_plain_text_recursive (WebKitDOMDocument *document,
                if (!(WEBKIT_DOM_IS_ELEMENT (node) || WEBKIT_DOM_IS_HTML_ELEMENT (node)))
                        goto next_node;
 
-               if (element_is_selection_marker (WEBKIT_DOM_ELEMENT (node))) {
+               if (e_html_editor_node_is_selection_position_node (node)) {
                        /* If there is collapsed selection in the beginning of line
                         * we cannot suppress first text that is after the end of
                         * selection */
@@ -5906,7 +5873,7 @@ quote_plain_text_recursive (WebKitDOMDocument *document,
 
                if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (node) &&
                    !next_sibling && WEBKIT_DOM_IS_ELEMENT (prev_sibling) &&
-                   element_is_selection_marker (WEBKIT_DOM_ELEMENT (prev_sibling))) {
+                   e_html_editor_node_is_selection_position_node (prev_sibling)) {
                        insert_quote_symbols_before_node (
                                document, node, quote_level, FALSE);
                        goto next_node;
@@ -7355,7 +7322,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                document, "-x-evo-selection-start-marker");
        selection_end_marker = webkit_dom_document_get_element_by_id (
                document, "-x-evo-selection-end-marker");
-       current_block = get_parent_block_node_from_child (
+       current_block = e_html_editor_get_parent_block_node_from_child (
                WEBKIT_DOM_NODE (selection_start_marker));
        if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (current_block))
                current_block = NULL;
@@ -7410,7 +7377,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                if (webkit_dom_node_is_same_node (first_paragraph, last_paragraph)) {
                        WebKitDOMNode *child, *parent;
 
-                       parent = get_parent_block_node_from_child (
+                       parent = e_html_editor_get_parent_block_node_from_child (
                                WEBKIT_DOM_NODE (selection_start_marker));
 
                        remove_quoting_from_element (WEBKIT_DOM_ELEMENT (parent));
@@ -7434,7 +7401,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                }
 
                /* Pasting content parsed into the multiple paragraphs */
-               parent = get_parent_block_node_from_child (
+               parent = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
 
                remove_quoting_from_element (WEBKIT_DOM_ELEMENT (parent));
@@ -7455,7 +7422,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (child))
                        remove_node (child);
 
-               parent = get_parent_block_node_from_child (
+               parent = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_end_marker));
 
                child = webkit_dom_node_get_next_sibling (
@@ -7513,7 +7480,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                remove_quoting_from_element (WEBKIT_DOM_ELEMENT (parent));
                remove_wrapping_from_element (WEBKIT_DOM_ELEMENT (parent));
 
-               parent = get_parent_block_node_from_child (
+               parent = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
                parent = WEBKIT_DOM_NODE (e_html_editor_selection_wrap_paragraph_length (
                        selection, WEBKIT_DOM_ELEMENT (parent), length));
@@ -7685,7 +7652,7 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view,
                selection_end_marker = webkit_dom_document_get_element_by_id (
                        document, "-x-evo-selection-end-marker");
 
-               block = get_parent_block_node_from_child (
+               block = e_html_editor_get_parent_block_node_from_child (
                        WEBKIT_DOM_NODE (selection_start_marker));
                parent = webkit_dom_node_get_parent_node (block);
                webkit_dom_element_remove_attribute (WEBKIT_DOM_ELEMENT (parent), "id");
@@ -11905,7 +11872,7 @@ undo_delete (EHTMLEditorView *view,
 
                /* All the nodes that are in the first block of the deleted content
                 * belongs to the current block right after the caret position. */
-               parent = get_parent_block_node_from_child (WEBKIT_DOM_NODE (element));
+               parent = e_html_editor_get_parent_block_node_from_child (WEBKIT_DOM_NODE (element));
                while ((node = webkit_dom_node_get_first_child (first_child)))
                        webkit_dom_node_append_child (WEBKIT_DOM_NODE (parent), node, NULL);
 
@@ -13108,7 +13075,7 @@ undo_redo_citation_split (EHTMLEditorView *view,
                        selection_start_marker = webkit_dom_document_get_element_by_id (
                                document, "-x-evo-selection-start-marker");
 
-                       block = get_parent_block_node_from_child (
+                       block = e_html_editor_get_parent_block_node_from_child (
                                WEBKIT_DOM_NODE (selection_start_marker));
                        remove_selection_markers (document);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]