nodeParent,
returned;
options = options || {};
- if(!(this.document.containsNode(this)) || !insertion.isNew) {
+ if(!(this.document.containsNode(this)) || !insertion.insertsNew) {
nodeParent = insertion.ofNode.parent();
}
+ if(!insertion.insertsNew && insertion.ofNode.isSurroundedByTextNodes()) {
+ var prev = insertion.ofNode.prev(),
+ next = insertion.ofNode.next();
+ prev.setText(prev.getText()+next.getText());
+ next.detach();
+ }
returned = implementation.call(this, insertion.ofNode);
- if(!options.silent && returned.sameNode(insertion.ofNode)) {
- this.triggerChangeEvent(insertion.insertsNew ? 'nodeAdded' : 'nodeMoved', {node: insertion.ofNode}, nodeParent, nodeWasContained);
+ if(!options.silent && returned && returned.sameNode(insertion.ofNode)) {
+ if(!insertion.insertsNew) {
+ this.triggerChangeEvent('nodeDetached', {node: insertion.ofNode, parent: nodeParent, move: true});
+ }
+ this.triggerChangeEvent('nodeAdded', {node: insertion.ofNode, move: !insertion.insertsNew}, nodeParent, nodeWasContained);
}
return returned;
};
if(this.isRoot()) {
return this.document.replaceRoot(node);
}
- toret = this.after(node);
- this.detach();
- return toret;
+ if(this.parent()) {
+ toret = this.after(node);
+ this.detach();
+ return toret;
+ }
+ throw new Error('Cannot replace node without a parent.');
},
after: INSERTION(function(node) {
+ if(this.isRoot()) {
+ return;
+ }
var next = this.next();
+
if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
next.setText(node.getText() + next.getText());
node.detach();
}),
before: INSERTION(function(node) {
+ if(this.isRoot()) {
+ return;
+ }
var prev = this.prev();
if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
prev.setText(prev.getText() + node.getText());
wrapWith: function(node) {
var insertion = this.getNodeInsertion(node);
- if(this.parent()) {
- this.before(insertion.ofNode);
+
+ if(this.parent() || this.isRoot()) {
+ this.replaceWith(insertion.ofNode);
}
insertion.ofNode.append(this);
return insertion.ofNode;
var elementNodeTransformations = {
- detach: function() {
- var next;
- if(this.parent() && this.isSurroundedByTextElements()) {
- next = this.next();
- this.prev().appendText(next.getText());
- next.detach();
+ detach: function(params) {
+ var next, prev;
+
+ params = params || {};
+
+ if(!params.normalizeStrategy) {
+ params.normalizeStrategy = 'merge';
+ }
+
+ if(this.parent() && this.isSurroundedByTextNodes()) {
+ if(params.normalizeStrategy === 'detach-left') {
+ this.prev().detach();
+ } else if(params.normalizeStrategy === 'detach-right') {
+ this.next().detach();
+ } else if(params.normalizeStrategy === 'merge') {
+ next = this.next();
+ prev = this.prev();
+ params.ret = {
+ mergedTo: prev,
+ previousLen: prev.getText().length
+ };
+ prev.appendText(next.getText());
+ next.detach();
+ } else {
+ throw new Error('unknown normalize strategy for detach');
+ }
}
return this.__super__.detach();
},
setTag: function(tagName) {
- var node = this.document.createDocumentNode({tagName: tagName}),
- oldTagName = this.getTagName(),
- myContents = this._$.contents();
+ var node = this.document.createDocumentNode({tagName: tagName});
this.getAttrs().forEach(function(attribute) {
- node.setAttr(attribute.name, attribute.value, true);
+ node.setAttr(attribute.name, attribute.value);
});
- node.setData(this.getData());
- if(this.sameNode(this.document.root)) {
- this.document._defineDocumentProperties(node._$);
- }
+ this.contents().forEach(function(child) {
+ node.append(child);
+ });
- /* TODO: This invalidates old references to this node. Caching instances on nodes would fix this. */
- this._$.replaceWith(node._$);
- this._setNativeNode(node._$[0]);
- this._$.append(myContents);
- this.triggerChangeEvent('nodeTagChange', {oldTagName: oldTagName, newTagName: this.getTagName()});
- },
+ node.setData(this.getData());
+ this.replaceWith(node);
+ return node;
+ },
setAttr: function(name, value, silent) {
var oldVal = this.getAttr(name);
- this._$.attr(name, value);
+ if(_.isUndefined(value)) {
+ this._$.removeAttr(name);
+ } else {
+ this._$.attr(name, value);
+ }
if(!silent) {
this.triggerChangeEvent('nodeAttrChange', {attr: name, oldVal: oldVal, newVal: value});
}
return;
}
+ this.contents()
+ .filter(function(child) {
+ return child.getProperty('describesParent');
+ }.bind(this))
+ .forEach(function(child) {
+ child.detach();
+ });
+
var myContents = this.contents(),
myIdx = parent.indexOf(this);
-
if(myContents.length === 0) {
return this.detach();
}
-
var childrenLength = this.contents().length,
first = true,
shiftRange = false;
var newElement = this.document.createDocumentNode({tagName: parentElement.getTagName(), attrs: attrs});
parentElement.after(newElement);
+ succeedingChildren.reverse().forEach(function(child) {
+ newElement.prepend(child);
+ });
if(suffix.length > 0) {
- newElement.append({text: suffix});
+ newElement.prepend({text: suffix});
}
- succeedingChildren.forEach(function(child) {
- newElement.append(child);
- });
- return {first: parentElement, second: newElement};
+ return {first: parentElement, second: newElement, created: newElement};
},
divideWithElementNode: function(node, params) {
}
for(var i = idx1; i <= idx2; i++) {
- wrapper.append(parentContents[i].detach());
+ if(!parentContents[i].getProperty('describesParent')) {
+ wrapper.append(parentContents[i].detach());
+ }
}
insertingTarget[insertingMethod](wrapper);
wrapperElement.append({text: prefixInside});
}
for(var i = idx1 + 1; i < idx2; i++) {
- wrapperElement.append(contentsInside[i]);
+ if(!contentsInside[i].getProperty('describesParent')) {
+ wrapperElement.append(contentsInside[i]);
+ }
}
if(suffixInside.length > 0) {
wrapperElement.append({text: suffixInside});
return insertion.ofNode;
},
deleteText: function(params) {
- var ptr, next, toDetach, middle, text;
+ var ptr, next, nextNext, toDetach, middle, text;
if(params.from.node.sameNode(params.to.node)) {
ptr = params.from.node;
} else {
toDetach = next;
next = next.next();
- toDetach.detach();
+ nextNext = next ? next.next() : null;
+ toDetach.detach({normalizeStrategy: (next && next.sameNode(params.to.node)) ? 'merge' : 'detach-right'});
+ if(next && !next.isInDocument()) {
+ next = nextNext;
+ }
}
} else {
ptr = ptr.parent();
fnp / fnpeditor.git / blobdiff