diff options
| author | Tomas Popela <tpopela@redhat.com> | 2016-02-12 10:47:19 +0100 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2016-02-12 11:00:34 +0100 |
| commit | fef9944bd5973110b54c66676ae0e54ac5f66747 (patch) | |
| tree | 0f20329eefe7782853d1f59c17d0c7391b0306ef | |
| parent | 509800609bfd648a4217336f110c32a9fff77105 (diff) | |
| download | evolution-fef9944bd5973110b54c66676ae0e54ac5f66747.tar.gz | |
EHTMLEditorView - Undoing the citation split does not re-wrap and re-quote the block
| -rw-r--r-- | e-util/e-html-editor-view.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c index 6c364d5bf3..743437e9da 100644 --- a/e-util/e-html-editor-view.c +++ b/e-util/e-html-editor-view.c @@ -14405,16 +14405,6 @@ undo_redo_citation_split (EHTMLEditorView *view, return; parent = get_parent_block_element (WEBKIT_DOM_NODE (selection_start)); - - 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); - restore_selection_to_history_event_state (view, event->before); - - return; - } - citation_before = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (parent)); if (!is_citation_node (citation_before)) { e_html_editor_selection_restore (selection); @@ -14443,7 +14433,7 @@ undo_redo_citation_split (EHTMLEditorView *view, if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (tmp)) remove_node (tmp); - if (in_situ) { + if (in_situ && event->data.fragment) { webkit_dom_node_append_child ( webkit_dom_node_get_parent_node (last_child), webkit_dom_node_clone_node ( |