if(currentTag.attr('wlxml-tag'))
return;
- var meta = {};
+ 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'),
- meta: meta
+ meta: meta,
+ others: others
});
element.dom().append(currentTag.contents());
['orig-before', 'orig-append'].forEach(function(attr) {
- element.data(attr, '');
+ element.data(attr, ['']);
});
return element.dom();
});
this.wrapper.find(':not(iframe)').addBack().contents()
.filter(function() {return this.nodeType === Node.TEXT_NODE})
.each(function() {
-
- var el = $(this);
-
// TODO: use DocumentElement API
- var spanParent = el.parent().attr('wlxml-tag') === 'span',
- spanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span',
- spanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
-
- 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) ? ' ' : '')
- + trimmed
- + (endSpace && (spanParent || spanAfter) ? ' ' : '');
+ var el = $(this),
+ text = {original: el.text(), trimmed: $.trim(el.text())},
+ elParent = el.parent(),
+ hasSpanParent = elParent.attr('wlxml-tag') === 'span',
+ hasSpanBefore = el.prev().length > 0 && $(el.prev()[0]).attr('wlxml-tag') === 'span',
+ hasSpanAfter = el.next().length > 0 && $(el.next()[0]).attr('wlxml-tag') === 'span';
+
+
+ var addInfo = function(toAdd) {
+ 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);
+ }
+ }
+
+ 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.trimmed
+ + (endSpace && (hasSpanParent || hasSpanAfter) ? ' ' : '');
} else {
- var oldText = this.data,
- 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) {
- var parent = $(this).parent(),
- parentContents = parent.contents(),
- idx = parentContents.index(this),
- next = idx < parentContents.length - 1 ? parentContents[idx+1] : null;
-
- if(next) {
- $(next).data('orig-before', oldText);
- } else {
- parent.data('orig-append', oldText);
+ if(text.trimmed.length === 0 && text.original.length > 0 && elParent.contents().length === 1)
+ text.transformed = ' ';
+ }
+
+ if(!text.transformed) {
+ addInfo([text.original]);
+ el.remove();
+ return true; // continue
+ }
+
+ if(text.transformed !== text.original) {
+ var toAdd = [];
+ if(!text.trimmed) {
+ toAdd.push(text.original);
+ } else {
+ var startingMatch = text.original.match(/^\s+/g),
+ endingMatch = text.original.match(/\s+$/g),
+ startingWhiteSpace = startingMatch ? startingMatch[0] : null,
+ endingWhiteSpace = endingMatch ? endingMatch[0] : null;
+
+ if(endingWhiteSpace) {
+ if(text.transformed[text.transformed.length - 1] === ' ' && endingWhiteSpace[0] === ' ')
+ endingWhiteSpace = endingWhiteSpace.substr(1);
+ toAdd.push(endingWhiteSpace);
}
- $(this).remove();
- return true; // continue
+ if(startingWhiteSpace) {
+ if(text.transformed[0] === ' ' && startingWhiteSpace[startingWhiteSpace.length-1] === ' ')
+ startingWhiteSpace = startingWhiteSpace.substr(0, startingWhiteSpace.length -1);
+ toAdd.push(startingWhiteSpace);
+ }
}
+ addInfo(toAdd);
}
- var element = documentElement.DocumentTextElement.create({text: this.data});
- $(this).replaceWith(element.dom());
+ var element = documentElement.DocumentTextElement.create({text: text.transformed});
+ el.replaceWith(element.dom());
});
this.d = this.wrapper.children(0);
},
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 = $('<div>');
- d(this.doc(), parent, 0);
+ var parent = $('<div>'),
+ parts = this.doc().toXML(0);
+ parent.append(parts);
return parent.html();
}
});
fnp / fnpeditor.git / blobdiff