X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=ee1878bea462897f8f780cbf4665d9c7c70badc0;hb=5b75662318f84282d1c5c545e5a7680b95bd0ce5;hp=e8ea0122bfdb9b1dd9fa8f81dd01eeb803b6da04;hpb=2460f51da79a8d432202ed634f247ec556b89237;p=app.Builder.js

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index e8ea0122b..ee1878bea 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -552,7 +552,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                dataIndex : r.Field,
                type : r.Type,
                title : r.Field,
-               width : 100,
+               width : 200,
                ftype : 'TextField',
                display_field : rc, //r.Field + '_display_name',
                relates_to_table : rt,
@@ -631,23 +631,23 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                name : rec.data.dataIndex,
                width : rec.data.width,
                '|xns' : 'Roo.form',
-               'xtype' : rec.data.ftype
+               xtype : rec.data.ftype
            }
-            if (xtype == 'DateField') {
+            if (el.xtype == 'DateField') {
                el.format = 'Y-m-d';
                el.useIso = true;
                el.width = 100;
            }
            
-           if (xtype == 'TextArea') {
+           if (el.xtype == 'TextArea') {
                el.height = 100;
            }
            
-           if (xtype == 'Hidden') {
+           if (el.xtype == 'Hidden') {
                delete el.fieldLabel;
                delete el.width;
            }
-           if (xtype == 'Combobox') {
+           if (el.xtype == 'ComboBox') {
            
    
                el.queryParam  = 'query[' + rec.data.display_field + ']';// SET WHEN USED
@@ -701,15 +701,17 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            
            }
            
-           if (xtype == 'HtmlEditor') {
-               el.height = 100,
+           if (el.xtype == 'HtmlEditor') {
+               el.height = 250,
                el.resizable = 's',
-               el.toolbar = [
+               el.items = [
                    {
+                       '* prop' : 'toolbars[]',
                        '|xns' : 'Roo.form.HtmlEditor',
                        'xtype' : 'ToolbarContext'
                    },
                    {
+                       '* prop' : 'toolbars[]',
                        '|xns' : 'Roo.form.HtmlEditor',
                        'xtype' : 'ToolbarStandard'
    
@@ -719,7 +721,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            
            formElements.push(el);
            
-           formHeight += rec.data.ftype == 'TextArea' ? 100 : 30;
+           formHeight += rec.data.ftype == 'TextArea' ? 100 : ((rec.data.ftype == 'HtmlEditor') ? 250 : 30);
            
            
        });