mirror/slate
1
0
Fork 0
mirror of https://github.com/ianstormtaylor/slate.git synced 2025-09-01 19:22:35 +02:00
Code Issues Releases Wiki Activity

refactor add/remove mark transforms

Browse Source
This commit is contained in:
Ian Storm Taylor
2016-11-22 14:50:17 -08:00
parent fda14bf6cd
commit d32904c7c1
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/transforms/at-current-range.js
View File

@@ -10,25 +10,24 @@ import Normalize from '../utils/normalize'
export function addMark(transform, mark) { export function addMark(transform, mark) {
mark = Normalize.mark(mark) mark = Normalize.mark(mark)
const { state } = transform const { state } = transform
const { document, selection } = state const { document, selection } = state
if (selection.isExpanded) { if (selection.isExpanded) {
transform.addMarkAtRange(selection, mark) transform.addMarkAtRange(selection, mark)
return
} }
else if (selection.marks) { if (selection.marks) {
const marks = selection.marks.add(mark) const marks = selection.marks.add(mark)
const sel = selection.merge({ marks }) const sel = selection.merge({ marks })
transform.moveTo(sel) transform.moveTo(sel)
return
} }
else { const marks = document.getMarksAtRange(selection).add(mark)
const marks = document.getMarksAtRange(selection).add(mark) const sel = selection.merge({ marks })
const sel = selection.merge({ marks }) transform.moveTo(sel)
transform.moveTo(sel)
}
} }
/** /**
@@ -407,19 +406,19 @@ export function removeMark(transform, mark) {
if (selection.isExpanded) { if (selection.isExpanded) {
transform.removeMarkAtRange(selection, mark) transform.removeMarkAtRange(selection, mark)
return
} }
else if (selection.marks) { if (selection.marks) {
const marks = selection.marks.remove(mark) const marks = selection.marks.remove(mark)
const sel = selection.merge({ marks }) const sel = selection.merge({ marks })
transform.moveTo(sel) transform.moveTo(sel)
return
} }
else { const marks = document.getMarksAtRange(selection).remove(mark)
const marks = document.getMarksAtRange(selection).remove(mark) const sel = selection.merge({ marks })
const sel = selection.merge({ marks }) transform.moveTo(sel)
transform.moveTo(sel)
}
} }
/** /**