Merge branch 'hotfix/3.0.1'

LLKennedy · Jun 20, 2019 · ed7ce38 · ed7ce38
2 parents eefa536 + e6c69c1
commit ed7ce38
Show file tree

Hide file tree

Showing 11 changed files with 576 additions and 33 deletions.
diff --git a/components/barcode/barcode.go b/components/barcode/barcode.go
@@ -100,7 +100,7 @@ func (component Component) SetNamedProperties(properties render.NamedProperties)
 				c.Extra.QRLevel = qr.Q
 				c.Extra.QRMode = qr.Unicode
 			}
-			c.Type = render.BarcodeType(stringVal)
+			c.Type = stringVal
 			return nil
 		}
 		if strings.Contains("dRdGdBdAbRbGbBbA", name) && len(name) == 2 {
@@ -189,7 +189,10 @@ func (component Component) VerifyAndSetJSONData(data interface{}) (render.Compon
 		return component, props, err
 	}
 	if newVal != nil {
-		c.Type = render.BarcodeType(newVal.(string))
+		c.Type, err = render.ToBarcodeType(newVal.(string))
+		if err != nil {
+			return component, props, fmt.Errorf("for barcode type %s: %v", newVal, err)
+		}
 	}
 	c.NamedPropertiesMap, newVal, err = render.ExtractSingleProp(stringStruct.Content, "content", render.StringType, c.NamedPropertiesMap)
 	if err != nil {
@@ -282,11 +285,8 @@ func (component Component) VerifyAndSetJSONData(data interface{}) (render.Compon
 	if newVal != nil {
 		c.BackgroundColour.A = newVal.(uint8)
 	}
-	type invalidStruct struct {
-		Message string
-	}
 	for key := range c.NamedPropertiesMap {
-		props[key] = invalidStruct{Message: "Please replace me with real data"}
+		props[key] = struct{ Message string }{Message: "Please replace me with real data"}
 	}
 	return c, props, nil
 }