X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/81f3c62162311a0c697007389567e79aae9e597f..324bfe12fcbabe4da96256dd98bc16da5be3ab82:/src/wlxml/wlxml.js diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js index bdf7527..40f070c 100644 --- a/src/wlxml/wlxml.js +++ b/src/wlxml/wlxml.js @@ -12,8 +12,8 @@ var isMetaAttribute = function(attrName) { // -var WLXMLElementNode = function(nativeNode) { - smartxml.ElementNode.call(this, nativeNode); +var WLXMLElementNode = function(nativeNode, document) { + smartxml.ElementNode.call(this, nativeNode, document); }; WLXMLElementNode.prototype = Object.create(smartxml.ElementNode.prototype); @@ -21,19 +21,24 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { getClass: function() { return this.getAttr('class'); }, + setClass: function(klass) { + return this.setAttr('class', klass); + }, getMetaAttributes: function() { - var toret = {}; + var toret = []; this.getAttrs().forEach(function(attr) { - if(isMetaAttribute(attr.name)) - meta[attr.name.substr(5)] = attr.value; + if(isMetaAttribute(attr.name)) { + toret.push({name: attr.name.substr(5), value: attr.value}); + } }); return toret; }, getOtherAttributes: function() { var toret = {}; this.getAttrs().forEach(function(attr) { - if(attr.name != 'class' && !isMetaAttribute(attr.name)) + if(attr.name !== 'class' && !isMetaAttribute(attr.name)) { toret[attr.name] = attr.value; + } }); return toret; } @@ -42,6 +47,38 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, { var WLXMLDocument = function(xml) { smartxml.Document.call(this, xml); + + $(this.dom).find(':not(iframe)').addBack().contents() + .filter(function() {return this.nodeType === Node.TEXT_NODE;}) + .each(function() { + var el = $(this), + text = {original: el.text(), trimmed: $.trim(el.text())}, + elParent = el.parent(), + hasSpanParent = elParent.prop('tagName') === 'SPAN', + hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN', + hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN'; + + + 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.transformed += text.trimmed; + text.transformed += (endSpace && (hasSpanParent || hasSpanAfter) ? ' ' : ''); + } else { + if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1) { + text.transformed = ' '; + } + } + + if(!text.transformed) { + el.remove(); + return true; // continue + } + el.replaceWith(document.createTextNode(text.transformed)); + }); }; WLXMLDocument.prototype = Object.create(smartxml.Document.prototype); $.extend(WLXMLDocument.prototype, {