From: Aleksander Łukasz Date: Thu, 25 Jul 2013 11:30:32 +0000 (+0200) Subject: Fixing xml formatting X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/189dfb1a02272bf58fe1ad33d60461b4d05eb944?ds=sidebyside Fixing xml formatting Rewriting original formatting mechanism to keep information about original formatting on both ends of a node element --- diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index 19c2a3f..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}); diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js index 565e4b0..3ff84f8 100644 --- a/modules/documentCanvas/canvas/canvas.test3.js +++ b/modules/documentCanvas/canvas/canvas.test3.js @@ -1168,6 +1168,14 @@ describe('Canvas', function() { expect(partsIn).to.deep.equal(partsOut); }); + it('keeps white space at the beginning of text', function() { + var xmlIn = '
abc
some div
abc
', + c = canvas.fromXML(xmlIn), + xmlOut = c.toXML(); + + expect(xmlOut).to.equal(xmlIn); + }); + it('nests new children block elements', function() { var c = canvas.fromXML('
'); diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index 29b07df..9ddf190 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -173,58 +173,61 @@ $.extend(DocumentNodeElement.prototype, { var addFormatting = function() { var toret = $('
'); + var formattings = {}; - if(this.data('orig-before') && this.data('orig-before').length) { - this.data('orig-before').forEach(function(toAdd) { - if(toAdd) - toret.prepend(document.createTextNode(toAdd)); - }); + if(this.data('orig-before') !== undefined) { + if(this.data('orig-before')) { + toret.prepend(document.createTextNode(this.data('orig-before'))); + } } else if(level && this.getWlxmlTag() !== 'span') { toret.append('\n' + (new Array(level * 2 + 1)).join(' ')); } - if(this.data('orig-append') && this.data('orig-append').length) { - this.data('orig-append').forEach(function(toAdd) { - if(toAdd) - node.prepend(toAdd); - }); - } else if(this.getWlxmlTag() !== 'span'){ + + toret.append(node); + + if(this.data('orig-after')) { + toret.append(document.createTextNode(this.data('orig-after'))); + } + + /* Inside node */ + if(this.data('orig-begin')) { + node.prepend(this.data('orig-begin')); + formattings.begin = true; + } + + if(this.data('orig-end') !== undefined) { + if(this.data('orig-end')) { + node.append(this.data('orig-end')); + } + } else if(this.getWlxmlTag() !== 'span' && children.length){ node.append('\n' + (new Array(level * 2 + 1)).join(' ')); } - toret.append(node); - return toret.contents(); + + return {parts: toret.contents(), formattings: formattings}; }.bind(this); - var parts = addFormatting(node); + var children = this.children(), - childParts, - prevChildParts; + childParts; - var containsPrefixAndSuffix = function(idx) { - if(idx === children.length - 1 && node.contents().length === 2) - return true; - if(prevChildParts && prevChildParts.length > 1 && prevChildParts[0].nodeType === Node.TEXT_NODE && prevChildParts[1].nodeType === Node.TEXT_NODE) - return true; - return false; - } + var formatting = addFormatting(node); for(var i = children.length - 1; i >= 0; i--) { childParts = children[i].toXML(level + 1); if(typeof childParts === 'string') childParts = [document.createTextNode(childParts)]; - if(containsPrefixAndSuffix(i) && children[i] instanceof DocumentTextElement) { + if(formatting.formattings.begin) { $(node.contents()[0]).after(childParts); - } else { + } else node.prepend(childParts); - } - prevChildParts = childParts; } - return parts; + return formatting.parts; }, append: function(params) { if(params.tag !== 'span') - this.data('orig-append', []); + this.data('orig-ends', undefined); return manipulate(this, params, 'append'); }, before: function(params) {