X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/b2ed6c0477904d9bcbf8494043f231a5197f6b78..c62820ef529ff40e46d30aedff2ba870e8e18395:/modules/documentCanvas/canvas/canvas.js diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 9282d20..228bf20 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -245,7 +245,7 @@ $.extend(Canvas.prototype, { var parent = element.parent(), grandParent = parent ? parent.parent() : null, goto; - if(parent.children().length === 1) { + if(parent.children().length === 1 && parent.children()[0].sameNode(element)) { if(grandParent && grandParent.children().length === 1) { goto = grandParent.append({text: ''}); } else { @@ -257,6 +257,7 @@ $.extend(Canvas.prototype, { element.detach(); } canvas.setCurrentElement(goto, {caretTo: caretTo}); + canvas.publisher('contentChanged'); } else if(cursorAtOperationEdge) { // todo @@ -313,8 +314,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}; @@ -601,7 +605,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;