Fields: Fix 'validate=required' for number fields

Fixes #309
tabalinas · Nov 2, 2016 · 984c393 · 984c393
1 parent b247855
commit 984c393
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/fields/jsgrid.field.number.js b/src/fields/jsgrid.field.number.js
@@ -19,11 +19,15 @@
         },
 
         insertValue: function() {
-            return parseInt(this.insertControl.val() || 0, 10);
+            return this.insertControl.val()
+                ? parseInt(this.insertControl.val() || 0, 10)
+                : undefined;
         },
 
         editValue: function() {
-            return parseInt(this.editControl.val() || 0, 10);
+            return this.editControl.val()
+                ? parseInt(this.editControl.val() || 0, 10)
+                : undefined;
         },
 
         _createTextBox: function() {

diff --git a/src/jsgrid.core.js b/src/jsgrid.core.js
@@ -1152,14 +1152,13 @@
             };
 
             this._eachField(function(field) {
-                if(!field.validate)
+                if(!field.validate ||
+                   ($row === this._insertRow && !field.inserting) ||
+                   ($row === this._getEditRow() && !field.editing))
                     return;
 
                 var fieldValue = this._getItemFieldValue(item, field);
 
-                if(fieldValue === undefined)
-                    return;
-
                 var errors = this._validation.validate($.extend({
                     value: fieldValue,
                     rules: field.validate
@@ -1345,7 +1344,7 @@
         },
 
         _getEditRow: function() {
-            return this._editingRow.data(JSGRID_EDIT_ROW_DATA_KEY);
+            return this._editingRow && this._editingRow.data(JSGRID_EDIT_ROW_DATA_KEY);
         },
 
         deleteItem: function(item) {

diff --git a/tests/jsgrid.field.tests.js b/tests/jsgrid.field.tests.js
@@ -130,7 +130,7 @@ $(function() {
         equal(field.insertTemplate()[0].tagName.toLowerCase(), "input");
         equal(field.editTemplate(6)[0].tagName.toLowerCase(), "input");
         strictEqual(field.filterValue(), undefined);
-        strictEqual(field.insertValue(), 0);
+        strictEqual(field.insertValue(), undefined);
         strictEqual(field.editValue(), 6);
     });