callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#1398 - Composer: Fails to delete column/row of a table

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1398
This commit is contained in:
Milan Crha
2021-03-01 15:20:05 +01:00
parent 332819f6e1
commit 01d596cae4
2 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/webkit/e-editor.js
View File

@ -3747,6 +3747,22 @@ EvoEditor.setCurrentElement = function(element)
element.setAttribute(EvoEditor.CURRENT_ELEMENT_ATTR, "1");
}
// selects element of tag name 'tagName'; being it "TABLE*", then nearest TABLE-related element
EvoEditor.DialogUtilsCurrentElementFromFocus = function(tagName)
{
var node = document.getSelection().focusNode;
var anyInTable = tagName == "TABLE*";
while (node && node.tagName != "BODY") {
if (node.tagName == tagName || (anyInTable && (node.tagName == "TH" || node.tagName == "TR" || node.tagName == "TD"))) {
EvoEditor.setCurrentElement(node);
break;
}
node = node.parentElement;
}
}
EvoEditor.OnDialogOpen = function(name)
{
EvoEditor.propertiesSelection = null;
@ -4538,7 +4554,13 @@ EvoEditor.DialogUtilsTableDelete = function()
EvoUndoRedo.StartRecord(EvoUndoRedo.RECORD_KIND_CUSTOM, "TableDelete", element, element,
EvoEditor.CLAIM_CONTENT_FLAG_USE_PARENT_BLOCK_NODE | EvoEditor.CLAIM_CONTENT_FLAG_SAVE_HTML);
try {
var parent = element.parentElement;
element.remove();
if (EvoEditor.isEmptyParagraph(parent) && !parent.firstChild) {
parent.appendChild(document.createElement("BR"));
}
} finally {
EvoUndoRedo.StopRecord(EvoUndoRedo.RECORD_KIND_CUSTOM, "TableDelete");
EvoEditor.maybeUpdateFormattingState(EvoEditor.FORCE_MAYBE);

60
src/modules/webkit-editor/e-webkit-editor.c
View File

@ -2926,7 +2926,11 @@ webkit_editor_delete_cell_contents (EContentEditor *editor)
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableDeleteCellContent();");
"var arr = EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.DialogUtilsCurrentElementFromFocus(\"TABLE*\");"
"EvoEditor.DialogUtilsTableDeleteCellContent();"
"EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.RestoreCurrentElementAttr(arr);");
}
static void
@ -2935,7 +2939,11 @@ webkit_editor_delete_column (EContentEditor *editor)
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableDeleteColumn();");
"var arr = EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.DialogUtilsCurrentElementFromFocus(\"TABLE*\");"
"EvoEditor.DialogUtilsTableDeleteColumn();"
"EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.RestoreCurrentElementAttr(arr);");
}
static void
@ -2944,7 +2952,11 @@ webkit_editor_delete_row (EContentEditor *editor)
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableDeleteRow();");
"var arr = EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.DialogUtilsCurrentElementFromFocus(\"TABLE*\");"
"EvoEditor.DialogUtilsTableDeleteRow();"
"EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.RestoreCurrentElementAttr(arr);");
}
static void
@ -2953,43 +2965,51 @@ webkit_editor_delete_table (EContentEditor *editor)
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableDelete();");
"var arr = EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.DialogUtilsCurrentElementFromFocus(\"TABLE*\");"
"EvoEditor.DialogUtilsTableDelete();"
"EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.RestoreCurrentElementAttr(arr);");
}
static void
webikt_editor_call_table_insert (EContentEditor *editor,
const gchar *what,
gint where)
{
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"var arr = EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.DialogUtilsCurrentElementFromFocus(\"TABLE*\");"
"EvoEditor.DialogUtilsTableInsert(%s, %d);"
"EvoEditor.RemoveCurrentElementAttr();"
"EvoEditor.RestoreCurrentElementAttr(arr);",
what, where);
}
static void
webkit_editor_insert_column_after (EContentEditor *editor)
{
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableInsert(%s, %d);", "column", +1);
webikt_editor_call_table_insert (editor, "column", +1);
}
static void
webkit_editor_insert_column_before (EContentEditor *editor)
{
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableInsert(%s, %d);", "column", -1);
webikt_editor_call_table_insert (editor, "column", -1);
}
static void
webkit_editor_insert_row_above (EContentEditor *editor)
{
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableInsert(%s, %d);", "row", -1);
webikt_editor_call_table_insert (editor, "row", -1);
}
static void
webkit_editor_insert_row_below (EContentEditor *editor)
{
EWebKitEditor *wk_editor = E_WEBKIT_EDITOR (editor);
e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
"EvoEditor.DialogUtilsTableInsert(%s, %d);", "row", +1);
webikt_editor_call_table_insert (editor, "row", +1);
}
static void