X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/0e2f63417bf8442152e237949ba78abcc52b5157..b53df8a58d8dafedf5daf3275243acb8ae3c99f0:/modules/documentCanvas/canvas/canvas.js?ds=sidebyside diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 25fe689..7428e10 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -42,7 +42,8 @@ $.extend(Canvas.prototype, { klass: currentTag.attr('class'), meta: meta, others: others, - rawChildren: currentTag.contents() + rawChildren: currentTag.contents(), + prepopulateOnEmpty: true }, canvas); ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) { @@ -71,7 +72,7 @@ $.extend(Canvas.prototype, { hasSpanBefore = el.prev().length > 0 && getNode($(el.prev()[0])).attr('wlxml-tag') === 'span', hasSpanAfter = el.next().length > 0 && getNode($(el.next()[0])).attr('wlxml-tag') === 'span'; - if(el.parent().hasClass('canvas-widget')) + if(el.parent().hasClass('canvas-widget') || elParent.attr('document-text-element') !== undefined) return true; // continue var addInfo = function(toAdd, where) { @@ -140,36 +141,8 @@ $.extend(Canvas.prototype, { this.d = this.wrapper.children(0); - this.wrapper.on('keydown', function(e) { - if(e.which === 13) { - e.preventDefault(); - var cursor = canvas.getCursor(); - if(!cursor.isSelecting()) { - var position = cursor.getPosition(), - element = position.element; - - if(!(element.parent().parent())) { - return false; // top level element is unsplittable - } - - var elements = position.element.split({offset: position.offset}), - newEmpty, - goto; - - 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); - } - } - } - }); - - var KEYS = { + ENTER: 13, ARROW_LEFT: 37, ARROW_UP: 38, ARROW_RIGHT: 39, @@ -215,8 +188,8 @@ $.extend(Canvas.prototype, { direction = 'below'; caretTo = 'start'; } - var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode)) - canvas.setCurrentElement(element, {caretTo: caretTo}); + var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, element.dom()[0])); + canvas.setCurrentElement(el, {caretTo: caretTo}); } else { var txt = element.dom().contents()[0].data; if(e.which === KEYS.ARROW_LEFT && position.offset > 1 && txt.charAt(position.offset-2) === utils.unicode.ZWS) { @@ -254,7 +227,11 @@ $.extend(Canvas.prototype, { cursorAtOperationEdge = position.offsetAtEnd; } - if(element.getText().length === 1 || selectsWholeTextElement()) { + var willDeleteWholeText = function() { + return element.getText().length === 1 || selectsWholeTextElement(); + } + + if(willDeleteWholeText()) { e.preventDefault(); element.setText(''); } @@ -273,7 +250,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 { @@ -285,12 +262,54 @@ $.extend(Canvas.prototype, { element.detach(); } canvas.setCurrentElement(goto, {caretTo: caretTo}); + canvas.publisher('contentChanged'); } else if(cursorAtOperationEdge) { // todo e.preventDefault(); } } + + if(e.which === KEYS.ENTER) { + e.preventDefault(); + var cursor = canvas.getCursor(), + position = cursor.getPosition(), + element = position.element; + + if(!cursor.isSelecting()) { + if(e.ctrlKey) { + var added = element.after({tag: 'block'}); + added.append({text:''}); + canvas.setCurrentElement(added, {caretTo: 'start'}); + + } else { + + if(!(element.parent().parent())) { + return false; // top level element is unsplittable + } + + var elements = position.element.split({offset: position.offset}), + newEmpty, + 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)); + gotoOptions = {}; + } else { + goto = elements.second; + gotoOptions = {caretTo: 'start'}; + } + + canvas.setCurrentElement(goto, gotoOptions); + } + } + } }); this.wrapper.on('click', '[document-node-element], [document-text-element]', function(e) { @@ -300,8 +319,17 @@ $.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)) { + observer.disconnect(); + if(mutation.target.data === '') + mutation.target.data = utils.unicode.ZWS; + else if(mutation.oldValue === utils.unicode.ZWS) { + mutation.target.data = mutation.target.data.replace(utils.unicode.ZWS, ''); + canvas._moveCaretToTextElement(canvas.getDocumentElement(mutation.target), 'end'); + } + observer.observe(canvas.d[0], config); + canvas.publisher('contentChanged'); + } }); }); var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true}; @@ -588,7 +616,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; @@ -716,40 +745,23 @@ $.extend(Cursor.prototype, { anchorElement = this.canvas.getDocumentElement(selection.anchorNode), focusElement = this.canvas.getDocumentElement(selection.focusNode); - var getOffset = function(where) { - var toret, node; - if(where === 'anchor') { - node = selection.anchorNode; - toret = selection.anchorOffset; - } else { - node = selection.focusNode; - toret = selection.focusOffset; - } - - if(toret === 1 && node.data.charAt(0) === utils.unicode.ZWS) - toret = 0; - else if((toret === node.data.length - 1) && (node.data.charAt(node.data.length - 1) === utils.unicode.ZWS)) - toret++; - return toret; - } - if((!anchorElement) || (anchorElement instanceof documentElement.DocumentNodeElement) || (!focusElement) || focusElement instanceof documentElement.DocumentNodeElement) return {}; if(which === 'anchor') { return { element: anchorElement, - offset: getOffset('anchor'), - offsetAtBeginning: getOffset('anchor') === 0, - offsetAtEnd: selection.anchorNode.data.length === getOffset('anchor') + offset: selection.anchorOffset, + offsetAtBeginning: selection.anchorOffset === 0, + offsetAtEnd: selection.anchorNode.data.length === selection.anchorOffset }; } if(which === 'focus') { return { element: focusElement, - offset: getOffset('focus'), - offsetAtBeginning: getOffset('focus') === 0, - offsetAtEnd: selection.focusNode.data.length === getOffset('focus') + offset: selection.focusOffset, + offsetAtBeginning: selection.focusOffset === 0, + offsetAtEnd: selection.focusNode.data.length === selection.focusOffset }; } @@ -762,30 +774,30 @@ $.extend(Cursor.prototype, { if(anchorFirst) { if(which === 'start') { element = anchorElement; - offset = getOffset('anchor') + offset = selection.anchorOffset } else if(which === 'end') { element = focusElement, - offset = getOffset('focus') + offset = selection.focusOffset } } else { if(which === 'start') { element = focusElement, - offset = getOffset('focus') + offset = selection.focusOffset } else if(which === 'end') { element = anchorElement; - offset = getOffset('anchor') + offset = selection.anchorOffset } } } else { // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition if(which === 'start') { element = anchorElement; - offset = getOffset('anchor') + offset = selection.anchorOffset } else { element = focusElement; - offset = getOffset('focus') + offset = selection.focusOffset } }