sync

diff --git a/Roo/form/Radio.js b/Roo/form/Radio.js
index 0216a4b..974e543 100644 (file)
--- a/Roo/form/Radio.js
+++ b/Roo/form/Radio.js
@@ -77,7 +77,7 @@ Roo.extend(Roo.form.Radio, Roo.form.Checkbox, {
         //}
         this.setChecked(String(v) === String(this.inputValue), suppressEvent);
         
-        this.el.dom.form[this.name] = v;
+        this.el.dom.form[this.name].value = v;
      
         //this.fireEvent("check", this, this.checked);
     },

diff --git a/docs/json/roodata.json b/docs/json/roodata.json
index 485b3f2..1914e1d 100644 (file)
--- a/docs/json/roodata.json
+++ b/docs/json/roodata.json
@@ -216152,7 +216152,7 @@
           {
             "name" : "asString",
             "type" : "Boolean",
-            "desc" : "(default false)",
+            "desc" : "(def)",
             "isOptional" : false
           }
         ],
@@ -244914,7 +244914,7 @@
           {
             "name" : "asString",
             "type" : "Boolean",
-            "desc" : "(default false)",
+            "desc" : "(def)",
             "isOptional" : false
           }
         ],
@@ -259821,7 +259821,7 @@
         "desc" : "Sets the checked state of the checkbox.\nOn is always based on a string comparison between inputValue and the param.",
         "sig" : "(value, suppressEvent)",
         "static" : false,
-        "memberOf" : "Roo.form.Checkbox",
+        "memberOf" : "",
         "isStatic" : false,
         "isConstructor" : false,
         "isPrivate" : false,

diff --git a/docs/src/Roo_form_BasicForm.js.html b/docs/src/Roo_form_BasicForm.js.html
index e0a4d54..3573f10 100644 (file)
--- a/docs/src/Roo_form_BasicForm.js.html
+++ b/docs/src/Roo_form_BasicForm.js.html
@@ -507,6 +507,9 @@ clientValidation  Boolean          Applies to submit only.  Pass true to call fo
             </span><span class="jsdoc-keyword">for</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">id </span><span class="jsdoc-keyword">in </span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">){
                 </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-keyword">typeof </span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">] != </span><span class="jsdoc-string">'function' </span><span class="jsdoc-syntax">&amp;&amp; (</span><span class="jsdoc-var">field </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">this.findField</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">))){
 
+
+
+
                     </span><span class="jsdoc-keyword">if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">field.setFromData </span><span class="jsdoc-syntax">&amp;&amp;
                         </span><span class="jsdoc-var">field.valueField </span><span class="jsdoc-syntax">&amp;&amp;
                         </span><span class="jsdoc-var">field.displayField </span><span class="jsdoc-syntax">&amp;&amp;
@@ -521,6 +524,9 @@ clientValidation  Boolean          Applies to submit only.  Pass true to call fo
                         </span><span class="jsdoc-var">sd</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">field.displayField</span><span class="jsdoc-syntax">] = </span><span class="jsdoc-keyword">typeof</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">field.name</span><span class="jsdoc-syntax">]) == </span><span class="jsdoc-string">'undefined' </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">field.name</span><span class="jsdoc-syntax">];
                         </span><span class="jsdoc-var">field.setFromData</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">sd</span><span class="jsdoc-syntax">);
 
+                    } </span><span class="jsdoc-keyword">else if </span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">field.inputType </span><span class="jsdoc-syntax">&amp;&amp; </span><span class="jsdoc-var">field.inputType </span><span class="jsdoc-syntax">== </span><span class="jsdoc-string">'radio'</span><span class="jsdoc-syntax">) {
+
+                        </span><span class="jsdoc-var">field.setValue</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">]);
                     } </span><span class="jsdoc-keyword">else </span><span class="jsdoc-syntax">{
                         </span><span class="jsdoc-var">field.setValue</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">values</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">id</span><span class="jsdoc-syntax">]);
                     }
@@ -546,7 +552,7 @@ clientValidation  Boolean          Applies to submit only.  Pass true to call fo
     </span><span class="jsdoc-comment">/**
      * Returns the fields in this form as an object with key/value pairs. If multiple fields exist with the same name
      * they are returned as an array.
-     * @param {Boolean} asString (default false)
+     * @param {Boolean} asString (def)
      * @return {Object}
      */
     </span><span class="jsdoc-var">getValues </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">asString</span><span class="jsdoc-syntax">)

diff --git a/docs/src/Roo_form_Checkbox.js.html b/docs/src/Roo_form_Checkbox.js.html
index 39096f0..b22a8e7 100644 (file)
--- a/docs/src/Roo_form_Checkbox.js.html
+++ b/docs/src/Roo_form_Checkbox.js.html
@@ -190,7 +190,9 @@
             </span><span class="jsdoc-var">this.fireEvent</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'check'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">);
         }
         </span><span class="jsdoc-var">this.inSetChecked </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">;
-        </span><span class="jsdoc-var">this.el.dom.value </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">state </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">this.inputValue </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.valueOff</span><span class="jsdoc-syntax">;
+
+               </span><span class="jsdoc-var">this.el.dom.value </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">state </span><span class="jsdoc-syntax">? </span><span class="jsdoc-var">this.inputValue </span><span class="jsdoc-syntax">: </span><span class="jsdoc-var">this.valueOff</span><span class="jsdoc-syntax">;
+
         </span><span class="jsdoc-var">this.inSetChecked </span><span class="jsdoc-syntax">= </span><span class="jsdoc-keyword">false</span><span class="jsdoc-syntax">;
 
     },

diff --git a/docs/src/Roo_form_Radio.js.html b/docs/src/Roo_form_Radio.js.html
index 31049d3..464ced8 100644 (file)
--- a/docs/src/Roo_form_Radio.js.html
+++ b/docs/src/Roo_form_Radio.js.html
@@ -60,7 +60,47 @@
             </span><span class="jsdoc-var">this.el.dom.checked </span><span class="jsdoc-syntax">=   </span><span class="jsdoc-string">'checked' </span><span class="jsdoc-syntax">;
         }
 
-    }
+    },
+    </span><span class="jsdoc-comment">/**
+     * Sets the checked state of the checkbox.
+     * On is always based on a string comparison between inputValue and the param.
+     * @param {Boolean/String} value - the value to set 
+     * @param {Boolean/String} suppressEvent - whether to suppress the checkchange event.
+     */
+    </span><span class="jsdoc-var">setValue </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">,</span><span class="jsdoc-var">suppressEvent</span><span class="jsdoc-syntax">){
+
+
+        </span><span class="jsdoc-comment">//this.checked = (v === true || v === 'true' || v == '1' || String(v).toLowerCase() == 'on');
+        //if(this.el &amp;&amp; this.el.dom){
+        //    this.el.dom.checked = this.checked;
+        //    this.el.dom.defaultChecked = this.checked;
+        //}
+        </span><span class="jsdoc-var">this.setChecked</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">String</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">) === </span><span class="jsdoc-var">String</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.inputValue</span><span class="jsdoc-syntax">), </span><span class="jsdoc-var">suppressEvent</span><span class="jsdoc-syntax">);
+
+        </span><span class="jsdoc-var">this.el.dom.form</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">this.name</span><span class="jsdoc-syntax">] = </span><span class="jsdoc-var">v</span><span class="jsdoc-syntax">;
+
+        </span><span class="jsdoc-comment">//this.fireEvent(&quot;check&quot;, this, this.checked);
+    </span><span class="jsdoc-syntax">},
+    </span><span class="jsdoc-comment">// private..
+    </span><span class="jsdoc-var">setChecked </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">,</span><span class="jsdoc-var">suppressEvent</span><span class="jsdoc-syntax">)
+    {
 
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.wrap</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-var">this.wrap</span><span class="jsdoc-syntax">[</span><span class="jsdoc-var">state </span><span class="jsdoc-syntax">? </span><span class="jsdoc-string">'addClass' </span><span class="jsdoc-syntax">: </span><span class="jsdoc-string">'removeClass'</span><span class="jsdoc-syntax">](</span><span class="jsdoc-string">'x-menu-item-checked'</span><span class="jsdoc-syntax">);
+        }
+        </span><span class="jsdoc-var">this.checked </span><span class="jsdoc-syntax">= </span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">;
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">suppressEvent </span><span class="jsdoc-syntax">!== </span><span class="jsdoc-keyword">true</span><span class="jsdoc-syntax">){
+            </span><span class="jsdoc-var">this.fireEvent</span><span class="jsdoc-syntax">(</span><span class="jsdoc-string">'check'</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">this</span><span class="jsdoc-syntax">, </span><span class="jsdoc-var">state</span><span class="jsdoc-syntax">);
+        }
+
+
+
+
+    },
+    </span><span class="jsdoc-var">reset </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
+        </span><span class="jsdoc-comment">// this.setValue(this.resetValue);
+        //this.originalValue = this.getValue();
+        </span><span class="jsdoc-var">this.clearInvalid</span><span class="jsdoc-syntax">();
+    }
 
 });</span></code></body></html>
\ No newline at end of file

diff --git a/docs/symbols/Roo.form.BasicForm.json b/docs/symbols/Roo.form.BasicForm.json
index 32cc83a..abd6d5f 100644 (file)
--- a/docs/symbols/Roo.form.BasicForm.json
+++ b/docs/symbols/Roo.form.BasicForm.json
@@ -286,7 +286,7 @@
         {
           "name" : "asString",
           "type" : "Boolean",
-          "desc" : "(default false)",
+          "desc" : "(def)",
           "isOptional" : false
         }
       ],

diff --git a/docs/symbols/Roo.form.Form.json b/docs/symbols/Roo.form.Form.json
index 4b50cc6..5d461f7 100644 (file)
--- a/docs/symbols/Roo.form.Form.json
+++ b/docs/symbols/Roo.form.Form.json
@@ -808,7 +808,7 @@
         {
           "name" : "asString",
           "type" : "Boolean",
-          "desc" : "(default false)",
+          "desc" : "(def)",
           "isOptional" : false
         }
       ],

diff --git a/docs/symbols/Roo.form.Radio.json b/docs/symbols/Roo.form.Radio.json
index 49fc788..d41ae41 100644 (file)
--- a/docs/symbols/Roo.form.Radio.json
+++ b/docs/symbols/Roo.form.Radio.json
@@ -317,7 +317,7 @@
       "desc" : "Sets the checked state of the checkbox.\nOn is always based on a string comparison between inputValue and the param.",
       "sig" : "(value, suppressEvent)",
       "static" : false,
-      "memberOf" : "Roo.form.Checkbox",
+      "memberOf" : "",
       "isStatic" : false,
       "isConstructor" : false,
       "isPrivate" : false,

diff --git a/roojs-all.js b/roojs-all.js
index 97958a8..cac12bf 100644 (file)
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -1852,7 +1852,7 @@ this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange
 // Roo/form/Radio.js
 Roo.form.Radio=function(){Roo.form.Radio.superclass.constructor.apply(this,arguments);};Roo.extend(Roo.form.Radio,Roo.form.Checkbox,{inputType:'radio',getGroupValue:function(){return this.el.up('form').child('input[name='+this.el.dom.name+']:checked',true).value;
 },onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);if(this.inputValue!==undefined){this.el.dom.value=this.inputValue;}this.wrap=this.el.wrap({cls:"x-form-check-wrap"});if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel}
-);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name]=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');
+);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name].value=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');
 }this.checked=A;if(B!==true){this.fireEvent('check',this,A);}},reset:function(){this.clearInvalid();}});
 // Roo/rtf/namespace.js
 Roo.rtf={};

diff --git a/roojs-debug.js b/roojs-debug.js
index 1ecbd23..29bfd4a 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -45135,7 +45135,7 @@ Roo.extend(Roo.form.Radio, Roo.form.Checkbox, {
         //}
         this.setChecked(String(v) === String(this.inputValue), suppressEvent);
         
-        this.el.dom.form[this.name] = v;
+        this.el.dom.form[this.name].value = v;
      
         //this.fireEvent("check", this, this.checked);
     },

diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 5151bc0..8299201 100644 (file)
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -20636,7 +20636,7 @@ Roo.extend(Roo.form.Radio, Roo.form.Checkbox, {
         //}
         this.setChecked(String(v) === String(this.inputValue), suppressEvent);
         
-        this.el.dom.form[this.name] = v;
+        this.el.dom.form[this.name].value = v;
      
         //this.fireEvent("check", this, this.checked);
     },

diff --git a/roojs-ui.js b/roojs-ui.js
index f3db22c..1fb6fed 100644 (file)
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -905,7 +905,7 @@ this.el.on('DOMAttrModified',this.setFromHidden,this);this.el.on('propertychange
 // Roo/form/Radio.js
 Roo.form.Radio=function(){Roo.form.Radio.superclass.constructor.apply(this,arguments);};Roo.extend(Roo.form.Radio,Roo.form.Checkbox,{inputType:'radio',getGroupValue:function(){return this.el.up('form').child('input[name='+this.el.dom.name+']:checked',true).value;
 },onRender:function(ct,A){Roo.form.Checkbox.superclass.onRender.call(this,ct,A);if(this.inputValue!==undefined){this.el.dom.value=this.inputValue;}this.wrap=this.el.wrap({cls:"x-form-check-wrap"});if(this.boxLabel){this.wrap.createChild({tag:'label',htmlFor:this.el.id,cls:'x-form-cb-label',html:this.boxLabel}
-);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name]=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');
+);}if(this.checked){this.el.dom.checked='checked';}},setValue:function(v,A){this.setChecked(String(v)===String(this.inputValue),A);this.el.dom.form[this.name].value=v;},setChecked:function(A,B){if(this.wrap){this.wrap[A?'addClass':'removeClass']('x-menu-item-checked');
 }this.checked=A;if(B!==true){this.fireEvent('check',this,A);}},reset:function(){this.clearInvalid();}});
 // Roo/rtf/namespace.js
 Roo.rtf={};