X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/6839815113720ebc32eba7254471a46a9388c6da..61143e615dfb903cd11c11539b7259cc4bc8b9fe:/modules/documentCanvas/canvas/canvas.js diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index ba86a32..079c229 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -23,13 +23,28 @@ $.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-append'].forEach(function(attr) { + element.data(attr, ''); + }); + return element.dom(); }); this.wrapper.find(':not(iframe)').addBack().contents() @@ -43,21 +58,41 @@ $.extend(Canvas.prototype, { spanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span', spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span'; + var oldText = this.data, + oldLength = this.data.length; + var parent = el.parent(), + parentContents = parent.contents(), + idx = parentContents.index(this), + next = idx < parentContents.length - 1 ? parentContents[idx+1] : null; + + var addInfo = function() { + if(next) { + $(next).data('orig-before', oldText); + } else { + parent.data('orig-append', oldText); + } + } + 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) ? ' ' : '') + var newText = (startSpace && (spanParent || spanBefore) ? ' ' : '') + trimmed + (endSpace && (spanParent || spanAfter) ? ' ' : ''); - + if(newText !== oldText) { + this.data = newText; + addInfo(); + } } 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(); + addInfo(); + el.remove(); + return true; // continue } } @@ -74,20 +109,31 @@ $.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: '\u200B'}, this)); + canvas.setCurrentElement(goto); + } } } }); this.wrapper.on('keyup', function(e) { if(e.which >= 37 && e.which <= 40) - canvas.markAsCurrent(canvas.getCursor().getPosition().element) + canvas.setCurrentElement(canvas.getCursor().getPosition().element, {caretTo: false}) }); this.wrapper.on('click', '[wlxml-tag], [wlxml-text]', function(e) { e.stopPropagation(); - canvas.markAsCurrent(canvas.getCursor().getPosition().element) + canvas.setCurrentElement(canvas.getDocumentElement(e.target), {caretTo: false}); }); } else { @@ -156,17 +202,121 @@ $.extend(Canvas.prototype, { list: {}, - markAsCurrent: function(element) { - if(element instanceof documentElement.DocumentTextElement) { + + + highlightElement: function(element) { + this.wrapper.find('.highlighted-element').removeClass('highlighted-element'); + element.dom().addClass('highlighted-element'); + }, + + dimElement: function(element) { + element.dom().removeClass('highlighted-element'); + }, + + getCurrentNodeElement: function() { + return this.getDocumentElement(this.wrapper.find('.current-node-element')[0]); + }, + + getCurrentTextElement: function() { + return this.getDocumentElement(this.wrapper.find('.current-text-element')[0]); + }, + + + + setCurrentElement: function(element, params) { + params = _.extend({caretTo: 'end'}, params); + 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'); + element.dom().addClass('current-text-element'); + } else { + this.wrapper.find('.current-node-element').removeClass('current-node-element') + element.dom().addClass('current-node-element'); + this.publisher('currentElementChanged', element); + } + }.bind(this); + + + var isTextElement = element instanceof documentElement.DocumentTextElement, + 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'); - element.dom().addClass('current-text-element'); - this.markAsCurrent(element.parent()); - this.publisher('currentTextElementChanged', element); + + if(textElementToLand) { + _markAsCurrent(textElementToLand); + if(params.caretTo || !textElementToLand.sameNode(this.getCursor().getPosition().element)) + this._moveCaretToTextElement(textElementToLand, params.caretTo); // as method on element? + if(!(textElementToLand.sameNode(currentTextElement))) + this.publisher('currentTextElementSet', textElementToLand); + } else { + document.getSelection().removeAllRanges(); + } + + if(!(currentNodeElement && currentNodeElement.sameNode(nodeElementToLand))) { + _markAsCurrent(nodeElementToLand); + + this.publisher('currentNodeElementSet', nodeElementToLand); + } + }, + + _moveCaretToTextElement: function(element, where) { + var range = document.createRange(), + node = element.dom().contents()[0]; + + if(typeof where !== 'number') { + range.selectNodeContents(node); } else { - this.wrapper.find('.current-node-element').removeClass('current-node-element') - element.dom().addClass('current-node-element'); + range.setStart(node, where); } + + var collapseArg = true; + if(where === 'end') + collapseArg = false; + range.collapse(collapseArg); + + var selection = document.getSelection(); + + selection.removeAllRanges(); + selection.addRange(range); + this.wrapper.focus(); // FF requires this for caret to be put where range colllapses, Chrome doesn't. + }, + setCursorPosition: function(position) { + if(position.element) + this._moveCaretToTextElement(position.element, position.offset); + }, + + toXML: function() { + var d = function(element, parent, level) { + console.log(element.getText ? 'text: ' + element.getText() : 'node: ' + element.getWlxmlTag()); + var isElementNode = element instanceof documentElement.DocumentNodeElement; + parent.prepend(element.toXML(level)); + if(isElementNode) { + var dom = $(parent.children()[0]), + elementChildren = element.children(); + for(var i = elementChildren.length - 1; i >= 0; i--) { + d(elementChildren[i], dom, level + 1); + } + } + } + var parent = $('
'); + d(this.doc(), parent, 0); + return parent.html(); } }); @@ -328,15 +478,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 }; } @@ -366,7 +532,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 @@ -378,7 +544,9 @@ $.extend(Cursor.prototype, { return { element: element, - offset: offset + offset: offset, + offsetAtBeginning: offset === 0, + offsetAtEnd: element.getText().length === offset } } })