fnp
/
fnpeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linting
[fnpeditor.git]
/
src
/
smartxml
/
smartxml.js
diff --git
a/src/smartxml/smartxml.js
b/src/smartxml/smartxml.js
index
96fcdfe
..
248333e
100644
(file)
--- a/
src/smartxml/smartxml.js
+++ b/
src/smartxml/smartxml.js
@@
-5,10
+5,13
@@
define([
'use strict';
'use strict';
-var TEXT_NODE = Node.TEXT_NODE
, ELEMENT_NODE = Node.ELEMENT_NODE
;
+var TEXT_NODE = Node.TEXT_NODE;
var DocumentNode = function(nativeNode, document) {
var DocumentNode = function(nativeNode, document) {
+ if(!document) {
+ throw new Error('undefined document for a node');
+ }
this.document = document;
this.nativeNode = nativeNode;
this._$ = $(nativeNode);
this.document = document;
this.nativeNode = nativeNode;
this._$ = $(nativeNode);
@@
-30,14
+33,15
@@
$.extend(DocumentNode.prototype, {
},
wrapWith: function(node) {
},
wrapWith: function(node) {
- if(this.parent())
+ if(this.parent())
{
this.before(node);
this.before(node);
+ }
node.append(this);
},
});
node.append(this);
},
});
-var ElementNode = function(nativeNode) {
- DocumentNode.
apply(this, arguments
);
+var ElementNode = function(nativeNode
, document
) {
+ DocumentNode.
call(this, nativeNode, document
);
};
$.extend(ElementNode.prototype, DocumentNode.prototype, {
};
$.extend(ElementNode.prototype, DocumentNode.prototype, {
@@
-51,10
+55,12
@@
$.extend(ElementNode.prototype, DocumentNode.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)
+ if(this.nodeType === Node.ELEMENT_NODE)
{
toret.push(document.createElementNode(this));
toret.push(document.createElementNode(this));
- else if(this.nodeType === Node.TEXT_NODE)
+ }
+ else if(this.nodeType === Node.TEXT_NODE) {
toret.push(document.createTextNode(this));
toret.push(document.createTextNode(this));
+ }
});
return toret;
},
});
return toret;
},
@@
-85,15
+91,17
@@
$.extend(ElementNode.prototype, DocumentNode.prototype, {
unwrapContent: function() {
var parent = this.parent();
unwrapContent: function() {
var parent = this.parent();
- if(!parent)
+ if(!parent)
{
return;
return;
+ }
var parentContents = parent.contents(),
myContents = this.contents(),
myIdx = parent.indexOf(this);
var parentContents = parent.contents(),
myContents = this.contents(),
myIdx = parent.indexOf(this);
- if(myContents.length === 0)
+ if(myContents.length === 0)
{
return this.detach();
return this.detach();
+ }
var moveLeftRange, moveRightRange, leftMerged;
var moveLeftRange, moveRightRange, leftMerged;
@@
-125,12
+133,17
@@
$.extend(ElementNode.prototype, DocumentNode.prototype, {
element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)],
element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
};
element1: parent.contents()[myIdx + (moveLeftRange ? -1 : 0)],
element2: parent.contents()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)]
};
- }
+ }
,
+ toXML: function() {
+ var wrapper = $('<div>');
+ wrapper.append(this._$);
+ return wrapper.html();
+ }
});
});
-var TextNode = function(nativeNode) {
- DocumentNode.
apply(this, arguments
);
+var TextNode = function(nativeNode
, document
) {
+ DocumentNode.
call(this, nativeNode, document
);
};
$.extend(TextNode.prototype, DocumentNode.prototype, {
};
$.extend(TextNode.prototype, DocumentNode.prototype, {
@@
-172,6
+185,10
@@
$.extend(Document.prototype, {
createTextNode: function(nativeNode) {
return new this.TextNodeFactory(nativeNode, this);
createTextNode: function(nativeNode) {
return new this.TextNodeFactory(nativeNode, this);
+ },
+
+ toXML: function() {
+ return this.root.toXML();
}
});
}
});