X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/393685bcd5f1b3cf31cdea0cf36c2ac7e44f31c3..d6174a70be823dd5772d845b83e11d0b779ab513:/modules/documentCanvas/canvas/documentElement.js diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index 03f224a..94b8422 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -122,6 +122,7 @@ $.extend(DocumentNodeElement, { dom.attr('wlxml-meta-'+key, params.meta[key]); }); } + dom.data('other-attrs', params.others); return dom; }, @@ -162,18 +163,22 @@ $.extend(DocumentNodeElement.prototype, { node.attr('class', this.getWlxmlClass()); var meta = this.getWlxmlMetaAttrs(); meta.forEach(function(attr) { - node.attr('meta-' + attr.name, attr.value); + if(attr.value) + node.attr('meta-' + attr.name, attr.value); }); + _.keys(this.data('other-attrs') || {}).forEach(function(key) { + node.attr(key, this.data('other-attrs')[key]); + }, this); if(this.data('orig-before') !== undefined) { toret.append(document.createTextNode(this.data('orig-before'))); - } else if(level) { + } else if(level && this.getWlxmlTag() !== 'span') { toret.append('\n' + (new Array(level * 2 + 1)).join(' ')); } if(this.data('orig-append') !== undefined) { node.append(this.data('orig-append')); //toret = toret.prepend(document.createTextNode(this.data('orig-prepend'))); - } else { + } else if(this.getWlxmlTag() !== 'span'){ node.append('\n' + (new Array(level * 2 + 1)).join(' ')); } @@ -181,7 +186,8 @@ $.extend(DocumentNodeElement.prototype, { return toret.contents(); }, append: function(params) { - this.data('orig-append', undefined); + if(params.tag !== 'span') + this.data('orig-append', undefined); return manipulate(this, params, 'append'); }, before: function(params) {