projects
/
app.Builder.js
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resources/roo.builder.js
[app.Builder.js]
/
resources
/
roo.builder.js
diff --git
a/resources/roo.builder.js
b/resources/roo.builder.js
index
9a1f059
..
2163657
100644
(file)
--- a/
resources/roo.builder.js
+++ b/
resources/roo.builder.js
@@
-54,6
+54,9
@@
Builder = {
return;
}
return;
}
+ if (nodeName.match(/^#/)) { // comments?
+ return;
+ }
@@
-62,8
+65,8
@@
Builder = {
return;
}
if (nodeName != 'BODY') {
return;
}
if (nodeName != 'BODY') {
-
- if (currentElement
&& currentElement
.hasAttribute('flexy:include')) {
+ //Roo.log(currentElement);
+ if (currentElement.hasAttribute('flexy:include')) {
cb( '<flexy:include src="'+currentElement.getAttribute('flexy:include')+'"></flexy:include>');
cb( '<flexy:include src="'+currentElement.getAttribute('flexy:include')+'"></flexy:include>');
@@
-311,6
+314,9
@@
Builder = {
applyFlexy: function(tree)
{
applyFlexy: function(tree)
{
+ if (!tree.el) {
+ return;
+ }
if (typeof(tree['flexy:foreach']) != 'undefined') {
//Roo.log("add flexy:foreach");
tree.el.attr('flexy:foreach', tree['flexy:foreach']);
if (typeof(tree['flexy:foreach']) != 'undefined') {
//Roo.log("add flexy:foreach");
tree.el.attr('flexy:foreach', tree['flexy:foreach']);
@@
-328,13
+334,28
@@
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")
+
+ if (typeof(tree['flexy:ignore']) != 'undefined') {
+ //Roo.log("add flexy:if");
+ tree.el.attr('flexy:ignore', tree['flexy:ignore']);
+ }
+
tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']);
tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']);
- if (!tree.items || !tree.items.length) { return; }
+ Roo.log(tree);
+ //Roo.log("Add xtype")
+
+
- for (var i = 0; i < tree.items.length; i++){
- this.applyFlexy(tree.items[i]);
+ if (tree.items && tree.items.length > 0) {
+ //Roo.log(tree);
+ for (var i = 0; i < tree.items.length; i++){
+ this.applyFlexy(tree.items[i]);
+ }
+ }
+ if (typeof(tree.menu) == 'object') {
+ this.applyFlexy(tree.menu);
}
}
+
}
}