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

some improvements

Browse source 
- mouse click handler on tools
- closing toolbar on toolclicked
This commit is contained in:
neSpecc 2016-05-11 07:29:33 +03:00
parent f249570f54
commit 0a6810b18f
1 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
codex-editor.js
View file

@ -217,9 +217,18 @@ cEditor.ui = {
cEditor.callback.redactorInputEvent(event); cEditor.callback.redactorInputEvent(event);
}, false ); }, false );
// for (button in cEditor.nodes.toolbarButtons){ for (button in cEditor.nodes.toolbarButtons){
// cEditor.nodes.toolbarButtons[button].addEventListener('click', cEditor.toolbar. toolClicked, false); cEditor.nodes.toolbarButtons[button].addEventListener('click', function (event) {
// }
console.log(this.dataset.type);
cEditor.toolbar.current = this.dataset.type;
cEditor.toolbar.toolClicked(event);
cEditor.toolbar.close();
}, false);
}
} }
@ -268,10 +277,12 @@ cEditor.callback = {
if (cEditor.toolbar.opened && event.target == cEditor.nodes.redactor) { if (cEditor.toolbar.opened && event.target == cEditor.nodes.redactor) {
console.log('preventDefault');
event.preventDefault(); event.preventDefault();
cEditor.toolbar.toolClicked(event); cEditor.toolbar.toolClicked(event);
// cEditor.toolbar.close(); cEditor.toolbar.close();
}; };
@ -289,7 +300,7 @@ cEditor.callback = {
cEditor.content.workingNodeChanged(); cEditor.content.workingNodeChanged();
// cEditor.toolbar.close(); cEditor.toolbar.close();
cEditor.toolbar.move(); cEditor.toolbar.move();
}, },
@ -395,6 +406,8 @@ cEditor.content = {
var nodeToReplace; var nodeToReplace;
console.log('0 %o', cEditor.content.currentNode);
/** /**
* First-level nodes replaces as-is, * First-level nodes replaces as-is,
* otherwise we need to replace parent node * otherwise we need to replace parent node
@ -405,11 +418,15 @@ cEditor.content = {
nodeToReplace = targetBlock.parentNode; nodeToReplace = targetBlock.parentNode;
} }
console.log('1 %o', cEditor.content.currentNode);
/** /**
* Make new node with original content * Make new node with original content
*/ */
var nodeCreated = cEditor.draw.block(newBlockTagname, targetBlock.innerHTML); var nodeCreated = cEditor.draw.block(newBlockTagname, targetBlock.innerHTML);
console.log('2 %o', cEditor.content.currentNode);
/** /**
* If it is a first-level node, replace as-is. * If it is a first-level node, replace as-is.
*/ */
@ -417,13 +434,16 @@ cEditor.content = {
cEditor.nodes.redactor.replaceChild(nodeCreated, nodeToReplace); cEditor.nodes.redactor.replaceChild(nodeCreated, nodeToReplace);
console.log('3 %o', cEditor.content.currentNode);
/** /**
* Set new node as current * Set new node as current
*/ */
cEditor.content.workingNodeChanged(nodeCreated); cEditor.content.workingNodeChanged(nodeCreated);
setTimeout(function() { // setTimeout(function() {
cEditor.content.currentNode.focus(); // cEditor.content.currentNode.focus();
}, 100); // }, 100);
console.log('4 %o', cEditor.content.currentNode);
return; return;
} }
@ -440,18 +460,26 @@ cEditor.content = {
default : newNodeWrapperTagname = 'P'; break; default : newNodeWrapperTagname = 'P'; break;
} }
console.log('5 %o', cEditor.content.currentNode);
newNodeWrapper = cEditor.draw.block(newNodeWrapperTagname); newNodeWrapper = cEditor.draw.block(newNodeWrapperTagname);
newNodeWrapper.appendChild(nodeCreated); newNodeWrapper.appendChild(nodeCreated);
console.log('6 %o', cEditor.content.currentNode);
cEditor.nodes.redactor.replaceChild(newNodeWrapper, nodeToReplace); cEditor.nodes.redactor.replaceChild(newNodeWrapper, nodeToReplace);
console.log('7 %o', cEditor.content.currentNode);
/** /**
* Set new node as current * Set new node as current
*/ */
cEditor.content.workingNodeChanged(nodeCreated); cEditor.content.workingNodeChanged(nodeCreated);
setTimeout(function() { // setTimeout(function() {
cEditor.content.currentNode.focus(); // cEditor.content.currentNode.focus();
}, 100); // }, 100);
console.log('8 %o', cEditor.content.currentNode);
} }