nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up composer link insertion and deletion

Browse source 
Allow deleting only the selected part of a link, and modify the existing
link instead of inserting a new one if the user didn't select any text.
Also restructure the code to avoid always-true or always-false if
statements.

Fixes #591
This commit is contained in:
Alex Henrie 2019-10-05 10:25:25 -06:00
parent a3c8b02f43
commit 52d010bb22
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/client/composer/composer-web-view.vala
View file

@ -344,10 +344,17 @@ public class ComposerWebView : ClientWebView {
}
/**
* Removes any A element at the current text cursor location.
* Removes the A element at the current text cursor location.
*
* If only part of the A element is selected, only that part is
* unlinked, possibly creating two new A elements flanking the
* unlinked section.
*/
public void delete_link() {
this.call.begin(Util.JS.callable("geary.deleteLink"), null);
public void delete_link(string selection_id) {
this.call.begin(
Util.JS.callable("geary.deleteLink").string(selection_id),
null
);
}
/**

2
src/client/composer/composer-widget.vala
View file

@ -2330,7 +2330,7 @@ public class ComposerWidget : Gtk.EventBox, Geary.BaseInterface {
this.editor.insert_link(popover.link_uri, selection_id);
});
popover.link_delete.connect(() => {
this.editor.delete_link();
this.editor.delete_link(selection_id);
});
popover.link_open.connect(() => { link_activated(popover.link_uri); });
return popover;

37
ui/composer-web-view.js
View file

@ -163,30 +163,31 @@ ComposerPageState.prototype = {
this.selections.delete(id);
},
insertLink: function(href, selectionId) {
if (!window.getSelection().isCollapsed) {
// There is currently a selection, so assume the user
// knows what they are doing and just linkify it.
SelectionUtil.restore(this.selections.get(selectionId));
if (window.getSelection().isCollapsed) {
// The saved selection was empty, which means that the user is
// modifying an existing link instead of inserting a new one.
let selection = SelectionUtil.save();
let selected = SelectionUtil.getCursorElement();
SelectionUtil.selectNode(selected);
document.execCommand("createLink", false, href);
SelectionUtil.restore(selection);
} else {
SelectionUtil.restore(this.selections.get(selectionId));
document.execCommand("createLink", false, href);
}
},
deleteLink: function() {
if (!window.getSelection().isCollapsed) {
// There is currently a selection, so assume the user
// knows what they are doing and just unlink it.
document.execCommand("unlink", false, null);
} else {
deleteLink: function(selectionId) {
SelectionUtil.restore(this.selections.get(selectionId));
if (window.getSelection().isCollapsed) {
// The saved selection was empty, which means that the user is
// deleting the entire existing link.
let selection = SelectionUtil.save();
let selected = SelectionUtil.getCursorElement();
if (selected != null && selected.tagName == "A") {
// The current cursor element is an A, so select it
// since unlink requires a range
let selection = SelectionUtil.save();
SelectionUtil.selectNode(selected);
document.execCommand("unlink", false, null);
SelectionUtil.restore(selection);
}
SelectionUtil.selectNode(selected);
document.execCommand("unlink", false, null);
SelectionUtil.restore(selection);
} else {
document.execCommand("unlink", false, null);
}
},
indentLine: function() {