[evolution/wip/webkit2] EHTMLEditorSelection - Fix the change of a list formatting to another list formatting
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit2] EHTMLEditorSelection - Fix the change of a list formatting to another list formatting
- Date: Fri, 26 Feb 2016 09:11:45 +0000 (UTC)
commit 049d94a503151a93ae9908c38290d6d8b84beed7
Author: Tomas Popela <tpopela redhat com>
Date: Fri Feb 26 09:35:41 2016 +0100
EHTMLEditorSelection - Fix the change of a list formatting to another list formatting
.../e-html-editor-selection-dom-functions.c | 200 ++++++++++++++++++--
1 files changed, 185 insertions(+), 15 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 7c5d7a1..5de2000 100644
--- a/web-extensions/composer/e-html-editor-selection-dom-functions.c
+++ b/web-extensions/composer/e-html-editor-selection-dom-functions.c
@@ -4974,6 +4974,50 @@ get_list_node_from_child (WebKitDOMNode *child)
return webkit_dom_node_get_parent_node (parent);
}
+static WebKitDOMElement *
+do_format_change_list_to_list (WebKitDOMElement *list_to_process,
+ WebKitDOMElement *new_list_template,
+ EHTMLEditorSelectionBlockFormat to)
+{
+ EHTMLEditorSelectionBlockFormat current_format;
+
+ current_format = dom_get_list_format_from_node (
+ WEBKIT_DOM_NODE (list_to_process));
+ if (to == current_format) {
+ /* Same format, skip it. */
+ return list_to_process;
+ } else if (current_format >= E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST &&
+ to >= E_HTML_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST) {
+ /* Changing from ordered list type to another ordered list type. */
+ set_ordered_list_type_to_element (list_to_process, to);
+ return list_to_process;
+ } else {
+ WebKitDOMNode *clone, *child;
+
+ /* Create new list from template. */
+ clone = webkit_dom_node_clone_node (
+ WEBKIT_DOM_NODE (new_list_template), FALSE);
+
+ /* Insert it before the list that we are processing. */
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (
+ WEBKIT_DOM_NODE (list_to_process)),
+ clone,
+ WEBKIT_DOM_NODE (list_to_process),
+ NULL);
+
+ /* Move all it children to the new one. */
+ while ((child = webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (list_to_process))))
+ webkit_dom_node_append_child (clone, child, NULL);
+
+ remove_node (WEBKIT_DOM_NODE (list_to_process));
+
+ return WEBKIT_DOM_ELEMENT (clone);
+ }
+
+ return NULL;
+}
+
static void
format_change_list_from_list (WebKitDOMDocument *document,
EHTMLEditorWebExtension *extension,
@@ -4992,31 +5036,139 @@ format_change_list_from_list (WebKitDOMDocument *document,
if (!selection_start_marker || !selection_end_marker)
return;
- new_list = create_list_element (document, extension, to, 0, html_mode);
-
/* Copy elements from previous block to list */
- item = get_list_item_node_from_child (
- WEBKIT_DOM_NODE (selection_start_marker));
+ item = get_list_item_node_from_child (WEBKIT_DOM_NODE (selection_start_marker));
source_list = webkit_dom_node_get_parent_node (item);
current_list = source_list;
source_list_clone = webkit_dom_node_clone_node (source_list, FALSE);
+ new_list = create_list_element (document, extension, to, 0, html_mode);
+
if (element_has_class (WEBKIT_DOM_ELEMENT (source_list), "-x-evo-indented"))
element_add_class (WEBKIT_DOM_ELEMENT (new_list), "-x-evo-indented");
while (item) {
+ gboolean selection_end;
WebKitDOMNode *next_item = webkit_dom_node_get_next_sibling (item);
+ selection_end = webkit_dom_node_contains (
+ item, WEBKIT_DOM_NODE (selection_end_marker));
+
if (WEBKIT_DOM_IS_HTML_LI_ELEMENT (item)) {
+ /* Actual node is an item, just copy it. */
+ webkit_dom_node_append_child (
+ after_selection_end ?
+ source_list_clone : WEBKIT_DOM_NODE (new_list),
+ item,
+ NULL);
+ } else if (node_is_list (item) && !selection_end && !after_selection_end) {
+ /* Node is a list and it doesn't contain the selection end
+ * marker, we can process the whole list. */
+ gint ii;
+ WebKitDOMNodeList *list;
+ WebKitDOMElement *processed_list;
+
+ list = webkit_dom_element_query_selector_all (
+ WEBKIT_DOM_ELEMENT (item), "ol,ul", NULL);
+ ii = webkit_dom_node_list_get_length (list);
+ g_object_unref (list);
+
+ /* Process every sublist separately. */
+ while (ii) {
+ WebKitDOMElement *list_to_process;
+
+ list_to_process = webkit_dom_element_query_selector (
+ WEBKIT_DOM_ELEMENT (item), "ol,ul", NULL);
+ if (list_to_process)
+ do_format_change_list_to_list (list_to_process, new_list, to);
+ ii--;
+ }
+
+ /* Process the current list. */
+ processed_list = do_format_change_list_to_list (
+ WEBKIT_DOM_ELEMENT (item), new_list, to);
+
+ webkit_dom_node_append_child (
+ after_selection_end ?
+ source_list_clone : WEBKIT_DOM_NODE (new_list),
+ WEBKIT_DOM_NODE (processed_list),
+ NULL);
+ } else if (node_is_list (item) && !after_selection_end) {
+ /* Node is a list and it contains the selection end marker,
+ * thus we have to process it until we find the marker. */
+ gint ii;
+ WebKitDOMNodeList *list;
+
+ list = webkit_dom_element_query_selector_all (
+ WEBKIT_DOM_ELEMENT (item), "ol,ul", NULL);
+ ii = webkit_dom_node_list_get_length (list);
+ g_object_unref (list);
+
+ /* No nested lists - process the items. */
+ if (ii == 0) {
+ WebKitDOMNode *clone, *child;
+
+ clone = webkit_dom_node_clone_node (
+ WEBKIT_DOM_NODE (new_list), FALSE);
+
+ webkit_dom_node_append_child (
+ after_selection_end ?
+ source_list_clone : WEBKIT_DOM_NODE (new_list),
+ clone,
+ NULL);
+
+ while ((child = webkit_dom_node_get_first_child (item))) {
+ webkit_dom_node_append_child (clone, child, NULL);
+ if (webkit_dom_node_contains (child, WEBKIT_DOM_NODE
(selection_end_marker)))
+ break;
+ }
+
+ if (webkit_dom_node_get_first_child (item))
+ webkit_dom_node_append_child (
+ after_selection_end ?
+ source_list_clone : WEBKIT_DOM_NODE (new_list),
+ item,
+ NULL);
+ else
+ remove_node (item);
+ } else {
+ gboolean done = FALSE;
+ WebKitDOMNode *tmp_parent = WEBKIT_DOM_NODE (new_list);
+ WebKitDOMNode *tmp_item = WEBKIT_DOM_NODE (item);
+
+ while (!done) {
+ WebKitDOMNode *clone, *child;
+
+ clone = webkit_dom_node_clone_node (
+ WEBKIT_DOM_NODE (new_list), FALSE);
+
+ webkit_dom_node_append_child (
+ tmp_parent, clone, NULL);
+
+ while ((child = webkit_dom_node_get_first_child (tmp_item))) {
+ if (!webkit_dom_node_contains (child, WEBKIT_DOM_NODE
(selection_end_marker))) {
+ webkit_dom_node_append_child (clone, child, NULL);
+ } else if (WEBKIT_DOM_IS_HTML_LI_ELEMENT (child)) {
+ webkit_dom_node_append_child (clone, child, NULL);
+ done = TRUE;
+ break;
+ } else {
+ tmp_parent = clone;
+ tmp_item = child;
+ break;
+ }
+ }
+ }
+ }
+ } else {
webkit_dom_node_append_child (
after_selection_end ?
source_list_clone : WEBKIT_DOM_NODE (new_list),
- WEBKIT_DOM_NODE (item),
+ item,
NULL);
}
- if (webkit_dom_node_contains (item, WEBKIT_DOM_NODE (selection_end_marker))) {
- g_object_unref (source_list_clone);
+ if (selection_end) {
source_list_clone = webkit_dom_node_clone_node (current_list, FALSE);
after_selection_end = TRUE;
}
@@ -5024,24 +5176,42 @@ format_change_list_from_list (WebKitDOMDocument *document,
if (!next_item) {
if (after_selection_end)
break;
+
current_list = webkit_dom_node_get_next_sibling (current_list);
- next_item = webkit_dom_node_get_first_child (current_list);
+ if (!node_is_list_or_item (current_list))
+ break;
+ if (node_is_list (current_list)) {
+ next_item = webkit_dom_node_get_first_child (current_list);
+ if (!node_is_list_or_item (next_item))
+ break;
+ } else if (WEBKIT_DOM_IS_HTML_LI_ELEMENT (current_list)) {
+ next_item = current_list;
+ current_list = webkit_dom_node_get_parent_node (next_item);
+ }
}
+
item = next_item;
}
- if (webkit_dom_node_has_child_nodes (source_list_clone))
- webkit_dom_node_insert_before (
- webkit_dom_node_get_parent_node (source_list),
- WEBKIT_DOM_NODE (source_list_clone),
- webkit_dom_node_get_next_sibling (source_list), NULL);
+ webkit_dom_node_insert_before (
+ webkit_dom_node_get_parent_node (source_list),
+ WEBKIT_DOM_NODE (source_list_clone),
+ webkit_dom_node_get_next_sibling (source_list),
+ NULL);
+
if (webkit_dom_node_has_child_nodes (WEBKIT_DOM_NODE (new_list)))
webkit_dom_node_insert_before (
- webkit_dom_node_get_parent_node (source_list),
+ webkit_dom_node_get_parent_node (source_list_clone),
WEBKIT_DOM_NODE (new_list),
- webkit_dom_node_get_next_sibling (source_list), NULL);
+ source_list_clone, NULL);
+
if (!webkit_dom_node_has_child_nodes (source_list))
remove_node (source_list);
+
+ if (!webkit_dom_node_has_child_nodes (source_list_clone))
+ remove_node (source_list_clone);
+
+ merge_lists_if_possible (WEBKIT_DOM_NODE (new_list));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
