X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/8f081bf57a12544f14e278f6bfe7b4ee97f7fd84..b7ff51d1e49c089b204d837a6ee5524eefb8d175:/modules/documentCanvas/canvas/canvas.js diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 873b39e..48e4abf 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -284,16 +284,23 @@ $.extend(Canvas.prototype, { var elements = position.element.split({offset: position.offset}), newEmpty, - goto; + goto, + gotoOptions; if(position.offsetAtBeginning) newEmpty = elements.first; else if(position.offsetAtEnd) newEmpty = elements.second; + if(newEmpty) { goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this)); - canvas.setCurrentElement(goto); + gotoOptions = {}; + } else { + goto = elements.second; + gotoOptions = {caretTo: 'start'}; } + + canvas.setCurrentElement(goto, gotoOptions); } } } @@ -306,8 +313,11 @@ $.extend(Canvas.prototype, { var observer = new MutationObserver(function(mutations) { mutations.forEach(function(mutation) { - if(documentElement.DocumentTextElement.isContentContainer(mutation.target) && mutation.target.data === '') - mutation.target.data = utils.unicode.ZWS; + if(documentElement.DocumentTextElement.isContentContainer(mutation.target)) { + if(mutation.target.data === '') + mutation.target.data = utils.unicode.ZWS; + canvas.publisher('contentChanged'); + } }); }); var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true}; @@ -594,7 +604,8 @@ $.extend(Canvas.prototype.list, { var toret; if(parent.is('list')) { - listElement.wrapWithNodeElement({tag: 'div', klass: 'item'}); + var item = listElement.wrapWithNodeElement({tag: 'div', klass: 'item'}); + item.exec('toggleBullet', false); toret = listElement.parent(); } else { toret = listElement;