deblan-mirror/editor.js
deblan-mirror/editor.js
1
0
Fork 0
mirror of https://github.com/codex-team/editor.js synced 2024-06-02 14:02:17 +02:00
Code Issues Projects Releases Wiki Activity

fixed caret bugs

Browse source
This commit is contained in:
khaydarov 2016-05-19 18:21:26 +03:00
parent 0f85b814df
commit cbe84ccf7d
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
codex-editor.js
View file

@ -371,18 +371,30 @@ cEditor.content = {
/**
* Creates Documnt Range and sets to 0 position
* @param NodeElement - Changed Node.
* @param selectedNode - ChildNode before block modification
* @param caretPosition - caret offset before modification
*/
setCaret : function(NodeElement, caretPosition) {
setCaret : function(NodeElement, selectedNode, caretPosition = 0) {
var nodeFirstChild = NodeElement.firstChild;
var childs = NodeElement.childNodes,
nodeChild;
var range = document.createRange();
if (childs.length == 1)
nodeChild = NodeElement.firstChild;
var selection = window.getSelection();
else {
for(var i = 0; i < childs.length; i++)
if (selectedNode.textContent === childs[i].textContent)
nodeChild = childs[i];
}
range.setStart(nodeFirstChild, caretPosition);
range.setEnd(nodeFirstChild, caretPosition);
var range = document.createRange(),
selection = window.getSelection();
range.setStart(nodeChild, caretPosition);
range.setEnd(nodeChild, caretPosition);
selection.removeAllRanges();
selection.addRange(range);
@ -429,11 +441,6 @@ cEditor.content = {
switchBlock : function (targetBlock, newBlockTagname) {
/**
* Get caret position before we change block
*/
caretPosition = window.getSelection().anchorOffset;
if (!targetBlock || !newBlockTagname) return;
var nodeToReplace;
@ -453,6 +460,13 @@ cEditor.content = {
*/
var nodeCreated = cEditor.draw.block(newBlockTagname, targetBlock.innerHTML);
/**
* Get caret position before we change block
*/
var selection = window.getSelection(),
caretPosition = selection.anchorOffset,
selectedNode = selection.anchorNode;
/**
* If it is a first-level node, replace as-is.
*/
@ -469,8 +483,7 @@ cEditor.content = {
/**
* Получаем узел и передаем его setCaret
*/
var nodeChanged = cEditor.content.currentNode;
cEditor.content.setCaret(nodeChanged, caretPosition);
cEditor.content.setCaret(cEditor.content.currentNode, selectedNode, caretPosition);
return;
@ -500,7 +513,7 @@ cEditor.content = {
* Set new node as current
*/
cEditor.content.workingNodeChanged(nodeCreated);
cEditor.content.setCaret(nodeCreated, caretPosition);
cEditor.content.setCaret(nodeCreated, selectedNode, caretPosition);
}
}