sync

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 4969f7c..3fed2a9 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -208672,7 +208672,8 @@
       "Roo.SplitButton",
       "Roo.Toolbar.Button",
       "Roo.Toolbar.SplitButton",
-      "Roo.form.TextItem"
+      "Roo.form.TextItem",
+      "Roo.form.FieldSet"
     ],
     "tree_parent" : []
   },
@@ -240667,7 +240668,8 @@
       "Roo.SplitButton",
       "Roo.Toolbar.Button",
       "Roo.Toolbar.SplitButton",
-      "Roo.form.TextItem"
+      "Roo.form.TextItem",
+      "Roo.form.FieldSet"
     ],
     "tree_parent" : []
   },
@@ -248062,7 +248064,8 @@
       "Roo.SplitButton",
       "Roo.Toolbar.Button",
       "Roo.Toolbar.SplitButton",
-      "Roo.form.TextItem"
+      "Roo.form.TextItem",
+      "Roo.form.FieldSet"
     ],
     "tree_parent" : []
   },

diff --git a/docs/src/Roo_form_BasicForm.js.html b/docs/src/Roo_form_BasicForm.js.html
index 949b61b..04080e8 100644 (file)
--- a/docs/src/Roo_form_BasicForm.js.html
+++ b/docs/src/Roo_form_BasicForm.js.html
@@ -602,6 +602,14 @@ clientValidation  Boolean          Applies to submit only.  Pass true to call fo
 
         </span><span class="jsdoc-keyword">var </span><span class="jsdoc-var">ret </span><span class="jsdoc-syntax">= {};
         </span><span class="jsdoc-var">this.items.each</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">f</span><span class="jsdoc-syntax">){
+
+            </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">f.readOnly</span><span class="jsdoc-syntax">) {
+                </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">; </span><span class="jsdoc-comment">// skip read only values. - this is in theory to stop 'old' values being copied over new ones
+                        // if a subform contains a copy of them.
+                        // if you have subforms with the same editable data, you will need to copy the data back
+                        // and forth.
+            </span><span class="jsdoc-syntax">}
+
             </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(!</span><span class="jsdoc-var">f.getName</span><span class="jsdoc-syntax">()) {
                 </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
             }

diff --git a/docs/src/Roo_form_Layout.js.html b/docs/src/Roo_form_Layout.js.html
index 42151bc..1dec91c 100644 (file)
--- a/docs/src/Roo_form_Layout.js.html
+++ b/docs/src/Roo_form_Layout.js.html
@@ -12,7 +12,7 @@
 /**
  * @class Roo.form.Layout
  * @extends Roo.Component
- * @children Roo.form.Column Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem
+ * @children Roo.form.Column Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem Roo.form.FieldSet
  * Creates a container for layout and rendering of fields in an {@link Roo.form.Form}.
  * @constructor
  * @param {Object} config Configuration options
@@ -163,7 +163,7 @@
 </span><span class="jsdoc-comment">/**
  * @class Roo.form.Column
  * @extends Roo.form.Layout
- * @children Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem
+ * @children Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem Roo.form.FieldSet
  * Creates a column container for layout and rendering of fields in an {@link Roo.form.Form}.
  * @constructor
  * @param {Object} config Configuration options
@@ -198,7 +198,7 @@
 </span><span class="jsdoc-comment">/**
  * @class Roo.form.Row
  * @extends Roo.form.Layout
- * @children Roo.form.Column Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem
+ * @children Roo.form.Column Roo.form.Row Roo.form.Field Roo.Button Roo.form.TextItem Roo.form.FieldSet
  * Creates a row container for layout and rendering of fields in an {@link Roo.form.Form}.
  * @constructor
  * @param {Object} config Configuration options

diff --git a/docs/symbols/Roo.form.Column.json b/docs/symbols/Roo.form.Column.json
index 2ff10c9..893e383 100644 (file)
--- a/docs/symbols/Roo.form.Column.json
+++ b/docs/symbols/Roo.form.Column.json
@@ -33,7 +33,8 @@
     "Roo.SplitButton",
     "Roo.Toolbar.Button",
     "Roo.Toolbar.SplitButton",
-    "Roo.form.TextItem"
+    "Roo.form.TextItem",
+    "Roo.form.FieldSet"
   ],
   "tree_parent" : [],
   "desc" : "Creates a column container for layout and rendering of fields in an {@link Roo.form.Form}.",

diff --git a/docs/symbols/Roo.form.Layout.json b/docs/symbols/Roo.form.Layout.json
index fea1d46..94e8142 100644 (file)
--- a/docs/symbols/Roo.form.Layout.json
+++ b/docs/symbols/Roo.form.Layout.json
@@ -39,7 +39,8 @@
     "Roo.SplitButton",
     "Roo.Toolbar.Button",
     "Roo.Toolbar.SplitButton",
-    "Roo.form.TextItem"
+    "Roo.form.TextItem",
+    "Roo.form.FieldSet"
   ],
   "tree_parent" : [],
   "desc" : "Creates a container for layout and rendering of fields in an {@link Roo.form.Form}.",

diff --git a/docs/symbols/Roo.form.Row.json b/docs/symbols/Roo.form.Row.json
index 962ab56..4b86383 100644 (file)
--- a/docs/symbols/Roo.form.Row.json
+++ b/docs/symbols/Roo.form.Row.json
@@ -34,7 +34,8 @@
     "Roo.SplitButton",
     "Roo.Toolbar.Button",
     "Roo.Toolbar.SplitButton",
-    "Roo.form.TextItem"
+    "Roo.form.TextItem",
+    "Roo.form.FieldSet"
   ],
   "tree_parent" : [],
   "desc" : "Creates a row container for layout and rendering of fields in an {@link Roo.form.Form}.",