[evolution/gnome-3-18] EHTMLEditorView - Undoing and redoing Return press in the beginning of citation is wrong
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-18] EHTMLEditorView - Undoing and redoing Return press in the beginning of citation is wrong
- Date: Sun, 6 Dec 2015 14:10:37 +0000 (UTC)
commit 7de56e267c7780670a2c209b24098ac73ee59849
Author: Tomas Popela <tpopela redhat com>
Date: Sun Dec 6 14:56:55 2015 +0100
EHTMLEditorView - Undoing and redoing Return press in the beginning of citation is wrong
e-util/e-html-editor-view.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index e513dd9..28479be 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -14233,7 +14233,7 @@ undo_redo_citation_split (EHTMLEditorView *view,
parent = get_parent_block_element (WEBKIT_DOM_NODE (selection_start));
- if (event->data.fragment &&
+ if (!event->data.fragment ||
!webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (event->data.fragment))) {
remove_node (WEBKIT_DOM_NODE (parent));
merge_siblings_if_necessary (document, NULL);
@@ -14312,6 +14312,8 @@ undo_redo_citation_split (EHTMLEditorView *view,
e_html_editor_view_force_spell_check_in_viewport (view);
} else {
+ restore_selection_to_history_event_state (view, event->before);
+
if (in_situ) {
WebKitDOMElement *selection_start_marker;
WebKitDOMNode *block;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]