fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smartxml: fix - handle creation of an empty text node
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
e484070
..
0a1a354
100644
(file)
--- a/
src/smartxml/smartxml.js
+++ b/
src/smartxml/smartxml.js
@@
-54,7
+54,7
@@
$.extend(DocumentNode.prototype, {
parent: function() {
var parentNode = this.nativeNode.parentNode;
if(parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {
parent: function() {
var parentNode = this.nativeNode.parentNode;
if(parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {
- return this.document.create
Ele
mentNode(parentNode);
+ return this.document.create
Docu
mentNode(parentNode);
}
return null;
},
}
return null;
},
@@
-82,6
+82,12
@@
$.extend(DocumentNode.prototype, {
return myIdx < parentContents.length - 1 ? parentContents[myIdx+1] : null;
},
return myIdx < parentContents.length - 1 ? parentContents[myIdx+1] : null;
},
+ isSurroundedByTextElements: function() {
+ var prev = this.prev(),
+ next = this.next();
+ return prev && (prev.nodeType === Node.TEXT_NODE) && next && (next.nodeType === Node.TEXT_NODE);
+ },
+
after: INSERTION(function(nativeNode) {
return this._$.after(nativeNode);
}),
after: INSERTION(function(nativeNode) {
return this._$.after(nativeNode);
}),
@@
-91,13
+97,12
@@
$.extend(DocumentNode.prototype, {
}),
wrapWith: function(node) {
}),
wrapWith: function(node) {
- node = node instanceof ElementNode ? node : this.document.createElementNode(node);
-
+ var insertion = this.getNodeInsertion(node);
if(this.parent()) {
if(this.parent()) {
- this.before(
n
ode);
+ this.before(
insertion.ofN
ode);
}
}
-
n
ode.append(this);
- return
n
ode;
+
insertion.ofN
ode.append(this);
+ return
insertion.ofN
ode;
},
/**
},
/**
@@
-129,7
+134,7
@@
$.extend(DocumentNode.prototype, {
insertion.ofNode = node;
insertion.insertsNew = !this.document.containsNode(node);
} else {
insertion.ofNode = node;
insertion.insertsNew = !this.document.containsNode(node);
} else {
- insertion.ofNode = this.document.create
Ele
mentNode(node);
+ insertion.ofNode = this.document.create
Docu
mentNode(node);
insertion.insertsNew = true;
}
return insertion;
insertion.insertsNew = true;
}
return insertion;
@@
-152,13
+157,11
@@
$.extend(ElementNode.prototype, {
nodeType: Node.ELEMENT_NODE,
detach: function() {
nodeType: Node.ELEMENT_NODE,
detach: function() {
- var prev = this.prev(),
+ var next;
+ if(parent && this.isSurroundedByTextElements()) {
next = this.next();
next = this.next();
- if(parent) {
- if(prev && prev.nodeType === Node.TEXT_NODE && next && next.nodeType === Node.TEXT_NODE) {
- prev.appendText(next.getText());
- next.detach();
- }
+ this.prev().appendText(next.getText());
+ next.detach();
}
return DocumentNode.prototype.detach.call(this);
},
}
return DocumentNode.prototype.detach.call(this);
},
@@
-187,12
+190,7
@@
$.extend(ElementNode.prototype, {
var toret = [],
document = this.document;
this._$.contents().each(function() {
var toret = [],
document = this.document;
this._$.contents().each(function() {
- if(this.nodeType === Node.ELEMENT_NODE) {
- toret.push(document.createElementNode(this));
- }
- else if(this.nodeType === Node.TEXT_NODE) {
- toret.push(document.createTextNode(this));
- }
+ toret.push(document.createDocumentNode(this));
});
return toret;
},
});
return toret;
},
@@
-202,7
+200,7
@@
$.extend(ElementNode.prototype, {
},
setTag: function(tagName) {
},
setTag: function(tagName) {
- var node = this.document.create
Ele
mentNode({tagName: tagName}),
+ var node = this.document.create
Docu
mentNode({tagName: tagName}),
oldTagName = this.getTagName(),
myContents = this._$.contents();
oldTagName = this.getTagName(),
myContents = this._$.contents();
@@
-254,8
+252,7
@@
$.extend(ElementNode.prototype, {
return;
}
return;
}
- var parentContents = parent.contents(),
- myContents = this.contents(),
+ var myContents = this.contents(),
myIdx = parent.indexOf(this);
myIdx = parent.indexOf(this);
@@
-263,10
+260,12
@@
$.extend(ElementNode.prototype, {
return this.detach();
}
return this.detach();
}
- var moveLeftRange, moveRightRange, leftMerged;
+ var prev = this.prev(),
+ next = this.next(),
+ moveLeftRange, moveRightRange, leftMerged;
- if(
myIdx > 0 && (parentContents[myIdx-1]
.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
- p
arentContents[myIdx-1]
.appendText(myContents[0].getText());
+ if(
prev && (prev
.nodeType === TEXT_NODE) && (myContents[0].nodeType === TEXT_NODE)) {
+ p
rev
.appendText(myContents[0].getText());
myContents[0].detach();
moveLeftRange = true;
leftMerged = true;
myContents[0].detach();
moveLeftRange = true;
leftMerged = true;
@@
-275,9
+274,10
@@
$.extend(ElementNode.prototype, {
}
if(!(leftMerged && myContents.length === 1)) {
}
if(!(leftMerged && myContents.length === 1)) {
- if(myIdx < parentContents.length - 1 && (parentContents[myIdx+1].nodeType === TEXT_NODE) && (myContents[myContents.length-1].nodeType === TEXT_NODE)) {
- parentContents[myIdx+1].prependText(myContents[myContents.length-1].getText());
- myContents[myContents.length-1].detach();
+ var lastContents = _.last(myContents);
+ if(next && (next.nodeType === TEXT_NODE) && (lastContents.nodeType === TEXT_NODE)) {
+ next.prependText(lastContents.getText());
+ lastContents.detach();
moveRightRange = true;
}
}
moveRightRange = true;
}
}
@@
-370,9
+370,9
@@
$.extend(Document.prototype, Backbone.Events, {
ElementNodeFactory: ElementNode,
TextNodeFactory: TextNode,
ElementNodeFactory: ElementNode,
TextNodeFactory: TextNode,
- create
Ele
mentNode: function(from) {
- if(!(from instanceof
HTMLElement
)) {
- if(from.text) {
+ create
Docu
mentNode: function(from) {
+ if(!(from instanceof
Node
)) {
+ if(from.text
!== undefined
) {
from = document.createTextNode(from.text);
} else {
var node = $('<' + from.tagName + '>');
from = document.createTextNode(from.text);
} else {
var node = $('<' + from.tagName + '>');
@@
-393,10
+393,6
@@
$.extend(Document.prototype, Backbone.Events, {
return new Factory(from, this);
},
return new Factory(from, this);
},
- createTextNode: function(nativeNode) {
- return new this.TextNodeFactory(nativeNode, this);
- },
-
loadXML: function(xml, options) {
options = options || {};
defineDocumentProperties(this, $(parseXML(xml)));
loadXML: function(xml, options) {
options = options || {};
defineDocumentProperties(this, $(parseXML(xml)));
@@
-420,7
+416,7
@@
$.extend(Document.prototype, Backbone.Events, {
var parent = params.element1.parent(),
parentContents = parent.contents(),
var parent = params.element1.parent(),
parentContents = parent.contents(),
- wrapper = this.create
Ele
mentNode({
+ wrapper = this.create
Docu
mentNode({
tagName: params._with.tagName,
attrs: params._with.attrs}),
idx1 = parent.indexOf(params.element1),
tagName: params._with.tagName,
attrs: params._with.attrs}),
idx1 = parent.indexOf(params.element1),
@@
-490,7
+486,7
@@
$.extend(Document.prototype, Backbone.Events, {
throw new Error('Wrapping text in non-sibling text nodes not supported.');
}
throw new Error('Wrapping text in non-sibling text nodes not supported.');
}
- var wrapperElement = this.create
Ele
mentNode({tagName: params._with.tagName, attrs: params._with.attrs});
+ var wrapperElement = this.create
Docu
mentNode({tagName: params._with.tagName, attrs: params._with.attrs});
textNode1.after(wrapperElement);
textNode1.detach();
textNode1.after(wrapperElement);
textNode1.detach();
@@
-526,7
+522,7
@@
$.extend(Document.prototype, Backbone.Events, {
var defineDocumentProperties = function(doc, $document) {
Object.defineProperty(doc, 'root', {get: function() {
var defineDocumentProperties = function(doc, $document) {
Object.defineProperty(doc, 'root', {get: function() {
- return doc.create
Ele
mentNode($document[0]);
+ return doc.create
Docu
mentNode($document[0]);
}, configurable: true});
Object.defineProperty(doc, 'dom', {get: function() {
return $document[0];
}, configurable: true});
Object.defineProperty(doc, 'dom', {get: function() {
return $document[0];