From f8d8f2fa9ee8e915b4e4691b9c9b62bf6acaa365 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Fri, 15 Jan 2016 14:22:16 +0100
Subject: [PATCH] EHTMLEditorView - Pressing the Return key in the bulleted
 list does not end it

The Return key pressed in an empty item on the end of the bulleted list does not
end the list (as it is done by WebKit for other lists). This is caused by CSS
modifications of the bulleted list in the plain text mode (to have the "*"
character instead of bullet).
---
 e-util/e-html-editor-view.c | 55 +++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index c64003c911..bd42c4d34a 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -5424,13 +5424,57 @@ insert_tabulator (EHTMLEditorView *view)
 }
 
 static gboolean
+selection_is_in_empty_list_item (WebKitDOMNode *selection_start_marker)
+{
+	gchar *text;
+	WebKitDOMNode *sibling;
+
+	sibling = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker));
+
+	if (!sibling)
+		return TRUE;
+
+	/* Only text node with the zero width space character is allowed. */
+	if (!WEBKIT_DOM_IS_TEXT (sibling))
+		return FALSE;
+
+	if (webkit_dom_node_get_previous_sibling (sibling))
+		return FALSE;
+
+	if (webkit_dom_character_data_get_length (WEBKIT_DOM_CHARACTER_DATA (sibling)) != 1)
+		return FALSE;
+
+	text = webkit_dom_character_data_get_data (WEBKIT_DOM_CHARACTER_DATA (sibling));
+	if (!(text && g_strcmp0 (text, UNICODE_ZERO_WIDTH_SPACE) == 0)) {
+		g_free (text);
+		return FALSE;
+	}
+
+	g_free (text);
+
+	/* Selection needs to be collapsed. */
+	sibling = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_start_marker));
+	if (!e_html_editor_node_is_selection_position_node (sibling))
+		return FALSE;
+
+	/* After the selection end there could be just the BR element. */
+	sibling = webkit_dom_node_get_next_sibling (sibling);
+	if (sibling && !WEBKIT_DOM_IS_HTMLBR_ELEMENT (sibling))
+	       return FALSE;
+
+	if (sibling && webkit_dom_node_get_next_sibling (sibling))
+		return FALSE;
+
+	return TRUE;
+}
+
 static gboolean
 return_pressed_in_empty_list_item (EHTMLEditorView *view)
 {
 	EHTMLEditorSelection *selection;
 	WebKitDOMDocument *document;
-	WebKitDOMElement *selection_start_marker, *selection_end_marker;
-	WebKitDOMNode *parent, *node;
+	WebKitDOMElement *selection_start_marker;
+	WebKitDOMNode *parent;
 
 	selection = e_html_editor_view_get_selection (view);
 	if (!e_html_editor_selection_is_collapsed (selection))
@@ -5441,8 +5485,6 @@ return_pressed_in_empty_list_item (EHTMLEditorView *view)
 	document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view));
 	selection_start_marker = webkit_dom_document_get_element_by_id (
 		document, "-x-evo-selection-start-marker");
-	selection_end_marker = webkit_dom_document_get_element_by_id (
-		document, "-x-evo-selection-end-marker");
 
 	parent = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (selection_start_marker));
 	if (!WEBKIT_DOM_IS_HTMLLI_ELEMENT (parent)) {
@@ -5450,10 +5492,7 @@ return_pressed_in_empty_list_item (EHTMLEditorView *view)
 		return FALSE;
 	}
 
-	node = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker));
-	/* Check if return was pressed inside an empty list item. */
-	if (!webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker)) &&
-	    (!node || (node && WEBKIT_DOM_IS_HTMLBR_ELEMENT (node) && !webkit_dom_node_get_next_sibling (node)))) {
+	if (selection_is_in_empty_list_item (WEBKIT_DOM_NODE (selection_start_marker))) {
 		EHTMLEditorViewHistoryEvent *ev = NULL;
 		WebKitDOMDocumentFragment *fragment;
 		WebKitDOMElement *paragraph;