next.detach();
}
returned = implementation.call(this, insertion.ofNode);
- if(!options.silent && returned.sameNode(insertion.ofNode)) {
+ if(!options.silent && returned && returned.sameNode(insertion.ofNode)) {
if(!insertion.insertsNew) {
this.triggerChangeEvent('nodeDetached', {node: insertion.ofNode, parent: nodeParent, move: true});
}
},
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());
var elementNodeTransformations = {
- detach: function() {
- var next;
+ detach: function(params) {
+ var next, prev;
+
+ params = params || {};
+
+ if(!params.normalizeStrategy) {
+ params.normalizeStrategy = 'merge';
+ }
+
if(this.parent() && this.isSurroundedByTextNodes()) {
- next = this.next();
- this.prev().appendText(next.getText());
- next.detach();
+ 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();
},
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();