nodeParent,
returned;
options = options || {};
- if(!(this.document.containsNode(this))) {
+ 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(!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;
};
var documentNodeTransformations = {
detach: function() {
- var parent = this.parent();
+ var parent = this.parent(),
+ existed = this.document.containsNode(this);
this._$.detach();
- this.triggerChangeEvent('nodeDetached', {parent: parent});
+ if(existed) {
+ this.triggerChangeEvent('nodeDetached', {parent: parent});
+ if(!parent) {
+ // This was the root of the document
+ this.document._defineDocumentProperties(null);
+ }
+ }
return this;
},
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) {
var next = this.next();
if(next && next.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
next.setText(node.getText() + next.getText());
+ node.detach();
return next;
}
this._$.after(node.nativeNode);
var prev = this.prev();
if(prev && prev.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
prev.setText(prev.getText() + node.getText());
+ node.detach();
return prev;
}
this._$.before(node.nativeNode);
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;
detach: function() {
var next;
- if(this.parent() && this.isSurroundedByTextElements()) {
+ if(this.parent() && this.isSurroundedByTextNodes()) {
next = this.next();
this.prev().appendText(next.getText());
next.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);
var last = _.last(this.contents());
if(last && last.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
last.setText(last.getText() + node.getText());
+ node.detach();
return last;
} else {
this._$.append(node.nativeNode);
var first = this.contents()[0];
if(first && first.nodeType === Node.TEXT_NODE && node.nodeType === Node.TEXT_NODE) {
first.setText(node.getText() + first.getText());
+ node.detach();
return first;
} else {
this._$.prepend(node.nativeNode);
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;
before: INSERTION(function(node) {
if(node.nodeType === Node.TEXT_NODE) {
this.prependText(node.getText());
+ node.detach();
return this;
} else {
return this.__super__.before(node, {silent:true});
after: INSERTION(function(node) {
if(node.nodeType === Node.TEXT_NODE) {
this.appendText(node.getText());
+ node.detach();
return this;
} else {
return this.__super__.after(node, {silent:true});
}
}),
+ append: function(node) {
+ if(node.nodeType === Node.TEXT_NODE) {
+ this.appendText(node.getText());
+ node.detach();
+ return this;
+ }
+ },
+ prepend: function(node) {
+ if(node.nodeType === Node.TEXT_NODE) {
+ this.prependText(node.getText());
+ node.detach();
+ return this;
+ }
+ },
+
appendText: function(text) {
this.nativeNode.data = this.nativeNode.data + text;
this.triggerTextChangeEvent();
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};
},
}
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});
this._defineDocumentProperties(insertion.ofNode._$);
insertion.ofNode.triggerChangeEvent('nodeAdded');
return insertion.ofNode;
+ },
+ deleteText: function(params) {
+ var ptr, next, toDetach, middle, text;
+
+ if(params.from.node.sameNode(params.to.node)) {
+ ptr = params.from.node;
+ text = ptr.getText();
+ ptr.setText(text.substr(0, params.from.offset) + text.substr(params.to.offset));
+ return;
+ }
+
+ // Both edge text nodes need to be edited before anything else happen in case that
+ // they get merged when detaching content between them.
+ params.from.node.setText(params.from.node.getText().substr(0, params.from.offset));
+ params.to.node.setText(params.to.node.getText().substr(params.to.offset));
+
+ ptr = params.from.node;
+ next = ptr.next();
+
+ while(next || ptr.parent()) {
+ if(next) {
+ if(next.sameNode(params.to.node)) {
+ return;
+ }
+ else if(next.nodeType === Node.ELEMENT_NODE && next.containsNode(params.to.node)) {
+ middle = next;
+ break;
+ } else {
+ toDetach = next;
+ next = next.next();
+ toDetach.detach();
+ }
+ } else {
+ ptr = ptr.parent();
+ next = ptr.next();
+ }
+ }
+
+ if(!this.containsNode(params.to.node)) {
+ // The end node was merged during detaching nodes above - there is nothing more left to do.
+ return;
+ }
+
+ ptr = middle.contents()[0];
+ while(ptr && !ptr.sameNode(params.to.node)) {
+ if(ptr.nodeType === Node.ELEMENT_NODE && ptr.containsNode(params.to.node)) {
+ ptr = ptr.contents()[0];
+ continue;
+ } else {
+ ptr = ptr.next();
+ ptr.prev().detach();
+ }
+ }
}
};
fnp / fnpeditor.git / blobdiff