X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=ee1878bea462897f8f780cbf4665d9c7c70badc0;hb=5b75662318f84282d1c5c545e5a7680b95bd0ce5;hp=b6c1d97b82b70b56518d5fdd5884ae8db2cf319c;hpb=2510e218e2875d97a88c86953af6c5ba0311edd2;p=app.Builder.js diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js index b6c1d97b8..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, @@ -702,14 +702,16 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({ } if (el.xtype == 'HtmlEditor') { - el.height = 100, + 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); });