Changed Roo/form/NumberField.jsdocs/src/Roo_bootstrap_form_DateField.js.htmldocs...

diff --git a/Roo/form/NumberField.js b/Roo/form/NumberField.js
index 0ca2fca..cb4ba06 100644 (file)
--- a/Roo/form/NumberField.js
+++ b/Roo/form/NumberField.js
@@ -35,6 +35,10 @@ Roo.extend(Roo.form.NumberField, Roo.form.TextField,  {
      * @cfg {String} decimalSeparator Character(s) to allow as the decimal separator (defaults to '.')
      */
     decimalSeparator : ".",
+    /**
+     * @cfg {String} thousandSeparator Character(s) to allow as the thousand separator (defaults to '') - set to ',' for example
+     */
+    thousandSeparator : "",
     /**
      * @cfg {Number} decimalPrecision The maximum precision to display after the decimal separator (defaults to 2)
      */

diff --git a/docs/src/Roo_bootstrap_form_DateField.js.html b/docs/src/Roo_bootstrap_form_DateField.js.html
index 612c103..d495c3a 100644 (file)
--- a/docs/src/Roo_bootstrap_form_DateField.js.html
+++ b/docs/src/Roo_bootstrap_form_DateField.js.html
@@ -564,9 +564,9 @@
     </span><span class="jsdoc-var">showPopup </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">()
     {
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.readOnly</span><span class="jsdoc-syntax">) {
-                       </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
-               }
-               </span><span class="jsdoc-var">this.picker</span><span class="jsdoc-syntax">()</span><span class="jsdoc-var">.show</span><span class="jsdoc-syntax">();
+            </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
+        }
+        </span><span class="jsdoc-var">this.picker</span><span class="jsdoc-syntax">()</span><span class="jsdoc-var">.show</span><span class="jsdoc-syntax">();
         </span><span class="jsdoc-var">this.update</span><span class="jsdoc-syntax">();
         </span><span class="jsdoc-var">this.place</span><span class="jsdoc-syntax">();
 

diff --git a/docs/src/Roo_form_DateField.js.html b/docs/src/Roo_form_DateField.js.html
index 7fe3e90..dccfb17 100644 (file)
--- a/docs/src/Roo_form_DateField.js.html
+++ b/docs/src/Roo_form_DateField.js.html
@@ -341,7 +341,7 @@ dateField.setValue('2006-5-4');
     </span><span class="jsdoc-comment">// private
     // Implements the default empty TriggerField.onTriggerClick function to display the DatePicker
     </span><span class="jsdoc-var">onTriggerClick </span><span class="jsdoc-syntax">: </span><span class="jsdoc-keyword">function</span><span class="jsdoc-syntax">(){
-        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.disabled</span><span class="jsdoc-syntax">){
+        </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.disabled </span><span class="jsdoc-syntax">|| </span><span class="jsdoc-var">this.readOnly</span><span class="jsdoc-syntax">){
             </span><span class="jsdoc-keyword">return</span><span class="jsdoc-syntax">;
         }
         </span><span class="jsdoc-keyword">if</span><span class="jsdoc-syntax">(</span><span class="jsdoc-var">this.menu </span><span class="jsdoc-syntax">== </span><span class="jsdoc-keyword">null</span><span class="jsdoc-syntax">){

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 2b64bc6..324da9a 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -23653,9 +23653,9 @@ Roo.extend(Roo.bootstrap.form.DateField, Roo.bootstrap.form.Input,  {
     showPopup : function()
     {
         if(this.readOnly) {
-                       return;
-               }
-               this.picker().show();
+            return;
+        }
+        this.picker().show();
         this.update();
         this.place();