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
/
Editors
/
Editor.Roo.LayoutDialog.js
diff --git
a/resources/Editors/Editor.Roo.LayoutDialog.js
b/resources/Editors/Editor.Roo.LayoutDialog.js
index
4538bb1
..
ee1878b
100644
(file)
--- a/
resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/
resources/Editors/Editor.Roo.LayoutDialog.js
@@
-246,6
+246,11
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
}
}
},
}
}
},
+ {
+ '|xns' : 'Roo.Toolbar',
+ xns : Roo.Toolbar,
+ xtype : 'Separator'
+ },
{
'|xns' : 'Roo.Toolbar',
text : _this._strings['040076bde7f6b3387448e32b66c2eee0'],
{
'|xns' : 'Roo.Toolbar',
text : _this._strings['040076bde7f6b3387448e32b66c2eee0'],
@@
-547,7
+552,7
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
dataIndex : r.Field,
type : r.Type,
title : r.Field,
dataIndex : r.Field,
type : r.Type,
title : r.Field,
- width :
1
00,
+ width :
2
00,
ftype : 'TextField',
display_field : rc, //r.Field + '_display_name',
relates_to_table : rt,
ftype : 'TextField',
display_field : rc, //r.Field + '_display_name',
relates_to_table : rt,
@@
-596,8
+601,6
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
ar.push(a);
});
ar.push(a);
});
-
- Roo.log(ar);
this.schema = data;
//alert("IPC:TEST:" + JSON.stringify(ar));
this.schema = data;
//alert("IPC:TEST:" + JSON.stringify(ar));
@@
-626,25
+629,25
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
var el = {
fieldLabel : rec.data.title,
name : rec.data.dataIndex,
var el = {
fieldLabel : rec.data.title,
name : rec.data.dataIndex,
- width : r.data.width,
+ width : r
ec
.data.width,
'|xns' : 'Roo.form',
xtype : rec.data.ftype
}
'|xns' : 'Roo.form',
xtype : rec.data.ftype
}
- if (xtype == 'DateField') {
+ if (
el.
xtype == 'DateField') {
el.format = 'Y-m-d';
el.useIso = true;
el.width = 100;
}
el.format = 'Y-m-d';
el.useIso = true;
el.width = 100;
}
- if (xtype == 'TextArea') {
+ if (
el.
xtype == 'TextArea') {
el.height = 100;
}
el.height = 100;
}
- if (xtype == 'Hidden') {
+ if (
el.
xtype == 'Hidden') {
delete el.fieldLabel;
delete el.width;
}
delete el.fieldLabel;
delete el.width;
}
- if (
xtype == 'Combob
ox') {
+ if (
el.xtype == 'ComboB
ox') {
el.queryParam = 'query[' + rec.data.display_field + ']';// SET WHEN USED
el.queryParam = 'query[' + rec.data.display_field + ']';// SET WHEN USED
@@
-698,15
+701,17
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
}
}
- if (xtype == 'HtmlEditor') {
- el.height =
10
0,
+ if (
el.
xtype == 'HtmlEditor') {
+ el.height =
25
0,
el.resizable = 's',
el.resizable = 's',
- el.
toolbar
= [
+ el.
items
= [
{
{
+ '* prop' : 'toolbars[]',
'|xns' : 'Roo.form.HtmlEditor',
'xtype' : 'ToolbarContext'
},
{
'|xns' : 'Roo.form.HtmlEditor',
'xtype' : 'ToolbarContext'
},
{
+ '* prop' : 'toolbars[]',
'|xns' : 'Roo.form.HtmlEditor',
'xtype' : 'ToolbarStandard'
'|xns' : 'Roo.form.HtmlEditor',
'xtype' : 'ToolbarStandard'
@@
-716,7
+721,7
@@
Editor.Roo.LayoutDialog = new Roo.XComponent({
formElements.push(el);
formElements.push(el);
- formHeight += rec.data.ftype == 'TextArea' ? 100 :
30
;
+ formHeight += rec.data.ftype == 'TextArea' ? 100 :
((rec.data.ftype == 'HtmlEditor') ? 250 : 30)
;
});
});