X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/421c624a25e602a3d3bb72bd6c01cbb04cbf7d11..eda3b8f3b50cc6f2a7d770c8cdd0e35010062931:/modules/documentCanvas/canvas/canvas.js?ds=inline diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 7a1d930..f9f3ee0 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -1,8 +1,9 @@ define([ 'libs/jquery-1.9.1.min', 'libs/underscore-min', -'modules/documentCanvas/canvas/documentElement' -], function($, _, documentElement) { +'modules/documentCanvas/canvas/documentElement', +'modules/documentCanvas/canvas/utils' +], function($, _, documentElement, utils) { 'use strict'; @@ -23,47 +24,105 @@ $.extend(Canvas.prototype, { var currentTag = $(this); if(currentTag.attr('wlxml-tag')) return; - var element = documentElement.DocumentNodeElement.createDOM({ + + var meta = {}, others = {}; + for(var i = 0; i < this.attributes.length; i++) { + var attr = this.attributes[i]; + if(attr.name.substr(0, 5) === 'meta-') + meta[attr.name.substr(5)] = attr.value; + else if(attr.name !== 'class') + others[attr.name] = attr.value; + } + + var element = documentElement.DocumentNodeElement.create({ tag: currentTag.prop('tagName').toLowerCase(), - klass: currentTag.attr('class') + klass: currentTag.attr('class'), + meta: meta, + others: others }); - element.append(currentTag.contents()); - return element; + element.dom().append(currentTag.contents()); + ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) { + element.data(attr, ''); + }); + return element.dom(); }); this.wrapper.find(':not(iframe)').addBack().contents() .filter(function() {return this.nodeType === Node.TEXT_NODE}) .each(function() { - - var el = $(this); - // TODO: use DocumentElement API - var spanParent = el.parent().attr('wlxml-tag') === 'span', - spanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span', - spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span'; - - if(spanParent || spanBefore || spanAfter) { - var startSpace = /\s/g.test(this.data.substr(0,1)); - var endSpace = /\s/g.test(this.data.substr(-1)) && this.data.length > 1; - var trimmed = $.trim(this.data); - this.data = (startSpace && (spanParent || spanBefore) ? ' ' : '') - + trimmed - + (endSpace && (spanParent || spanAfter) ? ' ' : ''); + var el = $(this), + text = {original: el.text(), trimmed: $.trim(el.text())}, + elParent = el.parent(), + hasSpanParent = elParent.attr('wlxml-tag') === 'span', + hasSpanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span', + hasSpanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span'; + + + var addInfo = function(toAdd, where) { + var parentContents = elParent.contents(), + idx = parentContents.index(el[0]), + prev = idx > 0 ? parentContents[idx-1] : null, + next = idx < parentContents.length - 1 ? parentContents[idx+1] : null, + target, key; + + if(where === 'above') { + target = prev ? $(prev) : elParent; + key = prev ? 'orig-after' : 'orig-begin'; + } else if(where === 'below') { + target = next ? $(next) : elParent; + key = next ? 'orig-before' : 'orig-end'; + } else { throw new Object;} + + target.data(key, toAdd); + } + + text.transformed = text.trimmed; + + if(hasSpanParent || hasSpanBefore || hasSpanAfter) { + var startSpace = /\s/g.test(text.original.substr(0,1)), + endSpace = /\s/g.test(text.original.substr(-1)) && text.original.length > 1; + text.transformed = (startSpace && (hasSpanParent || hasSpanBefore) ? ' ' : '') + + text.trimmed + + (endSpace && (hasSpanParent || hasSpanAfter) ? ' ' : ''); } else { - var oldLength = this.data.length; - this.data = $.trim(this.data); - if(this.data.length === 0 && oldLength > 0 && el.parent().contents().length === 1) - this.data = ' '; - if(this.data.length === 0) { - $(this).remove(); - return true; // continue + if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1) + text.transformed = ' '; + } + + if(!text.transformed) { + addInfo(text.original, 'below'); + el.remove(); + return true; // continue + } + + if(text.transformed !== text.original) { + if(!text.trimmed) { + addInfo(text.original, 'below'); + } else { + var startingMatch = text.original.match(/^\s+/g), + endingMatch = text.original.match(/\s+$/g), + startingWhiteSpace = startingMatch ? startingMatch[0] : null, + endingWhiteSpace = endingMatch ? endingMatch[0] : null; + + if(endingWhiteSpace) { + if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ') + endingWhiteSpace = endingWhiteSpace.substr(1); + addInfo(endingWhiteSpace, 'below'); + } + + if(startingWhiteSpace) { + if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ') + startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1); + addInfo(startingWhiteSpace, 'above'); + } } } - var element = documentElement.DocumentTextElement.create({text: this.data}); - $(this).replaceWith(element.dom()); + var element = documentElement.DocumentTextElement.create({text: text.transformed}); + el.replaceWith(element.dom()); }); this.d = this.wrapper.children(0); @@ -74,22 +133,84 @@ $.extend(Canvas.prototype, { e.preventDefault(); var cursor = canvas.getCursor(); if(!cursor.isSelecting()) { - var position = cursor.getPosition(); - position.element.split({offset: position.offset}); + var position = cursor.getPosition(), + 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 = { + ARROW_LEFT: 37, + ARROW_UP: 38, + ARROW_RIGHT: 39, + ARROW_DOWN: 40 + } + this.wrapper.on('keyup', function(e) { if(e.which >= 37 && e.which <= 40) canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false}) }); + + this.wrapper.on('keydown', function(e) { + if(e.which >= 37 && e.which <= 40) { + var position = canvas.getCursor().getPosition(), + element = position.element; + if(element && (element instanceof documentElement.DocumentTextElement)) { + if(element.isEmpty()) { + var direction, caretTo; + if(e.which === KEYS.ARROW_LEFT || e.which === KEYS.ARROW_UP) { + direction = 'above'; + caretTo = 'end'; + } else { + direction = 'below'; + caretTo = 'start'; + } + var el = canvas.getDocumentElement(utils.nearestInDocumentOrder('[document-text-element]', direction, window.getSelection().focusNode)) + canvas.setCurrentElement(element, {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) { + e.preventDefault(); + canvas._moveCaretToTextElement(element, position.offset-2); + } + if(e.which === KEYS.ARROW_RIGHT && position.offset < txt.length - 1 && txt.charAt(position.offset+1) === utils.unicode.ZWS) { + e.preventDefault(); + canvas._moveCaretToTextElement(element, position.offset+2); + } + } + } + + + } + }); this.wrapper.on('click', '[wlxml-tag], [wlxml-text]', function(e) { e.stopPropagation(); canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false}); }); + + 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; + }); + }); + var config = { attributes: false, childList: false, characterData: true, subtree: true, characterDataOldValue: true}; + observer.observe(this.d[0], config); + } else { this.d = null; } @@ -179,14 +300,17 @@ $.extend(Canvas.prototype, { setCurrentElement: function(element, params) { params = _.extend({caretTo: 'end'}, params); - var findFirstDirectTextChild = function(e) { + var findFirstDirectTextChild = function(e, nodeToLand) { + var byBrowser = this.getCursor().getPosition().element; + if(byBrowser && byBrowser.parent().sameNode(nodeToLand)) + return byBrowser; var children = e.children(); for(var i = 0; i < children.length; i++) { if(children[i] instanceof documentElement.DocumentTextElement) return children[i]; } return null; - }; + }.bind(this); var _markAsCurrent = function(element) { if(element instanceof documentElement.DocumentTextElement) { this.wrapper.find('.current-text-element').removeClass('current-text-element'); @@ -200,25 +324,27 @@ $.extend(Canvas.prototype, { var isTextElement = element instanceof documentElement.DocumentTextElement, - textElementToLand = isTextElement ? element : findFirstDirectTextChild(element), nodeElementToLand = isTextElement ? element.parent() : element, + textElementToLand = isTextElement ? element : findFirstDirectTextChild(element, nodeElementToLand), currentTextElement = this.getCurrentTextElement(), currentNodeElement = this.getCurrentNodeElement(); if(currentTextElement && !(currentTextElement.sameNode(textElementToLand))) this.wrapper.find('.current-text-element').removeClass('current-text-element'); - if(textElementToLand && !(textElementToLand.sameNode(currentTextElement))) { + if(textElementToLand) { _markAsCurrent(textElementToLand); - if(params.caretTo) + if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element? - this.publisher('currentTextElementSet', element); + if(!(textElementToLand.sameNode(currentTextElement))) + this.publisher('currentTextElementSet', textElementToLand); + } else { + document.getSelection().removeAllRanges(); } if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) { _markAsCurrent(nodeElementToLand); - if(!textElementToLand) - document.getSelection().removeAllRanges(); + this.publisher('currentNodeElementSet', nodeElementToLand); } }, @@ -248,6 +374,13 @@ $.extend(Canvas.prototype, { setCursorPosition: function(position) { if(position.element) this._moveCaretToTextElement(position.element, position.offset); + }, + + toXML: function() { + var parent = $('
'), + parts = this.doc().toXML(0); + parent.append(parts); + return parent.html(); } }); @@ -409,15 +542,31 @@ $.extend(Cursor.prototype, { getSelectionAnchor: function() { return this.getSelectionBoundry('anchor'); }, + getSelectionFocus: function() { + return this.getSelectionBoundry('focus'); + }, getSelectionBoundry: function(which) { var selection = window.getSelection(), anchorElement = this.canvas.getDocumentElement(selection.anchorNode), focusElement = this.canvas.getDocumentElement(selection.focusNode); + if(anchorElement instanceof documentElement.DocumentNodeElement || focusElement instanceof documentElement.DocumentNodeElement) + return {}; + if(which === 'anchor') { return { element: anchorElement, - offset: selection.anchorOffset + offset: selection.anchorOffset, + offsetAtBeginning: selection.anchorOffset === 0, + offsetAtEnd: anchorElement && anchorElement.getText().length === selection.anchorOffset + }; + } + if(which === 'focus') { + return { + element: focusElement, + offset: selection.focusOffset, + offsetAtBeginning: selection.focusOffset === 0, + offsetAtEnd: focusElement && focusElement.getText().length === selection.focusOffset }; } @@ -447,7 +596,7 @@ $.extend(Cursor.prototype, { } } } else { - // TODO: Handle order + // TODO: Handle order via https://developer.mozilla.org/en-US/docs/Web/API/Node.compareDocumentPosition if(which === 'start') { element = anchorElement; offset = selection.anchorOffset @@ -459,7 +608,9 @@ $.extend(Cursor.prototype, { return { element: element, - offset: offset + offset: offset, + offsetAtBeginning: offset === 0, + offsetAtEnd: element.getText().length === offset } } })