projects
/
app.Builder.js
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resources/Editors/Editor.Roo.LayoutDialog.bjs
[app.Builder.js]
/
resources
/
roo.builder.js
diff --git
a/resources/roo.builder.js
b/resources/roo.builder.js
index
6fb9ed6
..
bf08085
100644
(file)
--- a/
resources/roo.builder.js
+++ b/
resources/roo.builder.js
@@
-35,12
+35,12
@@
Builder = {
traverseDOMTree : function(cb, currentElement, depth) {
traverseDOMTree : function(cb, currentElement, depth) {
- if (!currentElement) {
+ if (!currentElement
) {
return;
}
//console.log(currentElement);
return;
}
//console.log(currentElement);
- if (currentElement.className.match(/roo-dynamic/)) {
+ if (currentElement.className
&& currentElement.className
.match(/roo-dynamic/)) {
return;
}
return;
}
@@
-54,6
+54,9
@@
Builder = {
return;
}
return;
}
+ if (nodeName.match(/^#/)) { // comments?
+ return;
+ }
@@
-62,8
+65,13
@@
Builder = {
return;
}
if (nodeName != 'BODY') {
return;
}
if (nodeName != 'BODY') {
-
-
+ //Roo.log(currentElement);
+ if (currentElement.hasAttribute('flexy:include')) {
+
+
+ cb( '<flexy:include src="'+currentElement.getAttribute('flexy:include')+'"></flexy:include>');
+ return;
+ }
var i = 0;
// Prints the node tagName, such as <A>, <IMG>, etc
var i = 0;
// Prints the node tagName, such as <A>, <IMG>, etc
@@
-90,9
+98,7
@@
Builder = {
} else {
tagName = false;
}
} else {
tagName = false;
}
- if (currentElement.hasAttribute('flexy:include')) {
- cb( tagName ? "</"+tagName+">" : '');
- }
+
// Traverse the tree
i = 0;
// Traverse the tree
i = 0;
@@
-325,7
+331,7
@@
Builder = {
//Roo.log("add flexy:if");
tree.el.attr('flexy:include', tree['flexy:include']);
}
//Roo.log("add flexy:if");
tree.el.attr('flexy:include', tree['flexy:include']);
}
- Roo.log("Add xtype")
+
//
Roo.log("Add xtype")
tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']);
if (!tree.items || !tree.items.length) { return; }
tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']);
if (!tree.items || !tree.items.length) { return; }