fix(formly-field): fixed check in parseSet/parseGet to permit 0 keys

tuxtina · tuxtina · commit 72453ec03343 · 2016-03-18T19:48:04.000Z
#658
diff --git a/src/directives/formly-field.js b/src/directives/formly-field.js
@@ -104,7 +104,7 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo
 
     function parseSet(key, model, newVal) {
       // If either of these are null/undefined then just return undefined
-      if (!key || !model) {
+      if ((!key && key !== 0) || !model) {
         return
       }
       // If we are working with a number then $parse wont work, default back to the old way for now
@@ -121,7 +121,7 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo
 
     function parseGet(key, model) {
       // If either of these are null/undefined then just return undefined
-      if (!key || !model) {
+      if ((!key && key !== 0) || !model) {
         return undefined
       }
 
diff --git a/src/directives/formly-field.test.js b/src/directives/formly-field.test.js
@@ -500,6 +500,13 @@ describe('formly-field', function() {
       expect(scope.fields[0].initialValue).to.eq(defaultValue)
     })
 
+    it(`should be set if the key is 0`, () => {
+      scope.fields[0].key = 0
+      compileAndDigest()
+
+      expect(scope.fields[0].initialValue).to.eq(defaultValue)
+    })
+
     describe(`nested keys`, () => {
       const nestedObject = 'foo.bar'
       const nestedArray = 'baz[0]'
@@ -546,6 +553,19 @@ describe('formly-field', function() {
       expect(scope.model[key]).to.eq(defaultValue)
     })
 
+    it('should get and set values when key is 0', () => {
+      const key = 0
+      const defaultValue = 'bar'
+
+      scope.fields = [
+        {template: input, key, defaultValue},
+      ]
+      scope.model = {}
+
+      compileAndDigest()
+      expect(scope.model[key]).to.eq(defaultValue)
+    })
+
     it('should get and set values when key is alpha numeric with alpha first', () => {
       const key = 'A1'
       const defaultValue = 'bar'

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo`
`104`	`104`
`105`	`105`	`function parseSet(key, model, newVal) {`
`106`	`106`	`// If either of these are null/undefined then just return undefined`
`107`		`- if (!key \|\| !model) {`
	`107`	`+ if ((!key && key !== 0) \|\| !model) {`
`108`	`108`	`return`
`109`	`109`	`}`
`110`	`110`	`// If we are working with a number then $parse wont work, default back to the old way for now`
`@@ -121,7 +121,7 @@ function formlyField($http, $q, $compile, $templateCache, $interpolate, formlyCo`
`121`	`121`
`122`	`122`	`function parseGet(key, model) {`
`123`	`123`	`// If either of these are null/undefined then just return undefined`
`124`		`- if (!key \|\| !model) {`
	`124`	`+ if ((!key && key !== 0) \|\| !model) {`
`125`	`125`	`return undefined`
`126`	`126`	`}`
`127`	`127`