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

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 0432b9d32..ee1878bea 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -9,7 +9,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
  _strings : {
   'b021df6aac4654c454f46c77646e745f' :"Label",
   '793548e77e782c209a78ed67f255b5e2' :"Display Field",
-  '0b6519e9da7898cdc668f6016026e71d' :"To JSON",
+  '040076bde7f6b3387448e32b66c2eee0' :"To BJS",
   '4ce58cbe362a5d7b156992a496d55bf3' :"Database Column",
   '189efd19c4153526994a6d7ea5f6f068' :"Field Type",
   '2f616612593df62aeed112de4f03110e' :"Edit a Grid",
@@ -81,7 +81,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
        listeners : {
         click : function (_self, e)
          {
-             Roo.log(_this.ftype_combo);
              var data = {    
                  "manage_scale_id": {
                      "Field": "manage_scale_id",
@@ -241,7 +240,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                  }
              };
              
-             Roo.log('debuging...');
+             Roo.log('Loading Data...');
              _this.panel.loadData(data);
          
          }
@@ -249,15 +248,20 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
       },
       {
        '|xns' : 'Roo.Toolbar',
-       text : _this._strings['0b6519e9da7898cdc668f6016026e71d'],
+       xns : Roo.Toolbar,
+       xtype : 'Separator'
+      },
+      {
+       '|xns' : 'Roo.Toolbar',
+       text : _this._strings['040076bde7f6b3387448e32b66c2eee0'],
        xns : Roo.Toolbar,
        xtype : 'Button',
        listeners : {
         click : function (_self, e)
          {
              
-             Roo.log('Converting to JSON...');
-             _this.panel.toJson();
+             Roo.log('Converting to BJS...');
+             _this.panel.toBJS();
          
          }
        }
@@ -548,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,
@@ -597,8 +601,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            ar.push(a);
        });
        
-       
-       Roo.log(ar);
        this.schema = data;
        
        //alert("IPC:TEST:" + JSON.stringify(ar));
@@ -627,25 +629,25 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var el = {
                fieldLabel : rec.data.title,
                name : rec.data.dataIndex,
-               width : r.data.width,
+               width : rec.data.width,
                '|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;
            }
            
-           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
@@ -699,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'
    
@@ -717,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);
            
            
        });