webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Improved anchor updating/remove action

Browse Source 
Now will update the link mark if you have a no-range selection on the
link.
This commit is contained in:
Dan Brown
2022-01-19 23:22:48 +00:00
parent e3ead1c115
commit bb12541179
2 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
resources/js/editor/menu/item-anchor-button.js
View File

@ -6,6 +6,7 @@ import schema from "../schema";
import {MenuItem} from "./menu";
import {icons} from "./icons";
import {markRangeAtPosition, nullifyEmptyValues} from "../util";
/**
* @param {PmMarkType} markType
@ -46,7 +47,7 @@ function getLinkDialog(submitter, closer) {
new DialogRadioOptions({
"Same tab or window": "",
"New tab or window": "_blank",
},{
}, {
label: 'Behaviour',
id: 'target',
value: getMarkAttribute(schema.marks.link, 'target'),
@ -69,17 +70,29 @@ function getLinkDialog(submitter, closer) {
*/
function applyLink(formData, state, dispatch) {
const selection = state.selection;
const attrs = Object.fromEntries(formData);
if (dispatch) {
const tr = state.tr;
const attrs = nullifyEmptyValues(Object.fromEntries(formData));
if (!dispatch) return true;
if (attrs.href) {
tr.addMark(selection.from, selection.to, schema.marks.link.create(attrs));
} else {
tr.removeMark(selection.from, selection.to, schema.marks.link);
const tr = state.tr;
const noRange = (selection.from - selection.to === 0);
let from = selection.from;
let to = selection.to;
if (noRange) {
const linkRange = markRangeAtPosition(state, schema.marks.link, selection.from);
if (linkRange.from !== -1) {
from = linkRange.from;
to = linkRange.to;
}
dispatch(tr);
}
if (attrs.href) {
tr.addMark(from, to, schema.marks.link.create(attrs));
} else {
tr.removeMark(from, to, schema.marks.link);
}
dispatch(tr);
return true;
}