X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a1c752a1fd15569e947246924254c2a072462fb8..6330b31da3fdc3a5c18a6497a3757ab8ea7fab4d:/modules/documentCanvas/canvas/canvas.js?ds=sidebyside diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 96206c3..8ed9b58 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -41,8 +41,8 @@ $.extend(Canvas.prototype, { }); element.dom().append(currentTag.contents()); - ['orig-before', 'orig-append'].forEach(function(attr) { - element.data(attr, ['']); + ['orig-before', 'orig-after', 'orig-begin', 'orig-end'].forEach(function(attr) { + element.data(attr, ''); }); return element.dom(); }); @@ -60,15 +60,22 @@ $.extend(Canvas.prototype, { hasSpanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span'; - var addInfo = function(toAdd) { + var addInfo = function(toAdd, where) { var parentContents = elParent.contents(), idx = parentContents.index(el[0]), - next = idx < parentContents.length - 1 ? parentContents[idx+1] : null; - if(next) { - $(next).data('orig-before', toAdd); - } else { - elParent.data('orig-append', toAdd); - } + 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; @@ -85,15 +92,14 @@ $.extend(Canvas.prototype, { } if(!text.transformed) { - addInfo([text.original]); + addInfo(text.original, 'below'); el.remove(); return true; // continue } if(text.transformed !== text.original) { - var toAdd = []; if(!text.trimmed) { - toAdd.push(text.original); + addInfo(text.original, 'below'); } else { var startingMatch = text.original.match(/^\s+/g), endingMatch = text.original.match(/\s+$/g), @@ -103,16 +109,15 @@ $.extend(Canvas.prototype, { if(endingWhiteSpace) { if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ') endingWhiteSpace = endingWhiteSpace.substr(1); - toAdd.push(endingWhiteSpace); + addInfo(endingWhiteSpace, 'below'); } if(startingWhiteSpace) { if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ') startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1); - toAdd.push(startingWhiteSpace); + addInfo(startingWhiteSpace, 'above'); } } - addInfo(toAdd); } var element = documentElement.DocumentTextElement.create({text: text.transformed}); @@ -320,35 +325,9 @@ $.extend(Canvas.prototype, { }, toXML: function() { - var d = function(element, parent, level) { - console.log(element.getText ? 'text: ' + element.getText() : 'node: ' + element.getWlxmlTag()); - var isElementNode = element instanceof documentElement.DocumentNodeElement; - var parentChildren = parent.contents(); - var dom; - - var elXML = element.toXML(level); - if(parentChildren.length > 2 && parentChildren[0].nodeType === Node.TEXT_NODE && parentChildren[1].nodeType == Node.TEXT_NODE) { - $(parentChildren[0]).after(elXML); - } else { - parent.prepend(elXML); - } - - - if(isElementNode) { - elXML.each(function() { - if(this.nodeType === Node.ELEMENT_NODE) { - dom = $(this); - return; - } - }); - var 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); + var parent = $('
'), + parts = this.doc().toXML(0); + parent.append(parts); return parent.html(); } });