[evolution] Don't try to insert selection marks if they are already presented
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Don't try to insert selection marks if they are already presented
- Date: Fri, 19 Aug 2016 14:48:30 +0000 (UTC)
commit 25b02b3700b78322a622bcb7bdb0ddfc2ddf69f7
Author: Tomas Popela <tpopela redhat com>
Date: Fri Aug 19 14:59:41 2016 +0200
Don't try to insert selection marks if they are already presented
.../web-extension/e-editor-dom-functions.c | 27 +++++++++++---------
1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index fe55796..4d8b75f 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -4156,18 +4156,21 @@ e_editor_dom_move_quoted_block_level_up (EEditorPage *editor_page)
g_free (inner_html);
if (paragraph) {
- webkit_dom_node_insert_before (
- WEBKIT_DOM_NODE (paragraph),
- WEBKIT_DOM_NODE (selection_start_marker),
- webkit_dom_node_get_first_child (
- WEBKIT_DOM_NODE (paragraph)),
- NULL);
- webkit_dom_node_insert_before (
- WEBKIT_DOM_NODE (paragraph),
- WEBKIT_DOM_NODE (selection_end_marker),
- webkit_dom_node_get_first_child (
- WEBKIT_DOM_NODE (paragraph)),
- NULL);
+ if (!(webkit_dom_element_query_selector (paragraph, "#-x-evo-selection-start-marker",
NULL)))
+ webkit_dom_node_insert_before (
+ WEBKIT_DOM_NODE (paragraph),
+ WEBKIT_DOM_NODE (selection_start_marker),
+ webkit_dom_node_get_first_child (
+ WEBKIT_DOM_NODE (paragraph)),
+ NULL);
+
+ if (!(webkit_dom_element_query_selector (paragraph, "#-x-evo-selection-end-marker",
NULL)))
+ webkit_dom_node_insert_before (
+ WEBKIT_DOM_NODE (paragraph),
+ WEBKIT_DOM_NODE (selection_end_marker),
+ webkit_dom_node_get_first_child (
+ WEBKIT_DOM_NODE (paragraph)),
+ NULL);
e_editor_dom_remove_quoting_from_element (paragraph);
e_editor_dom_remove_wrapping_from_element (paragraph);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]