Merge remote-tracking branch 'origin/master'

# Conflicts: # example/www/js/anyline.energy.js
Anyline · May 11, 2017 · c49150a · c49150a
2 parents 9eb1851 + 0a36f74
commit c49150a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/example/www/js/anyline.barcode.js b/example/www/js/anyline.barcode.js
@@ -84,6 +84,12 @@ anyline.barcode = {
                 "mode": "auto",
                 "alignment": "bottom_right"
             },
+            "visualFeedback": {
+                "style": "rect",
+                "strokeColor": "0099FF",
+                "fillColor": "220099FF",
+                "animationDuration": 150
+            },
             "beepOnResult": true,
             "vibrateOnResult": true,
             "blinkAnimationOnResult": true,

diff --git a/example/www/js/anyline.energy.js b/example/www/js/anyline.energy.js
@@ -85,6 +85,11 @@ anyline.energy = {
         "mode": "manual",
         "alignment": "bottom_right"
       },
+      "visualFeedback": {
+        "style": "CONTOUR_RECT",
+        "strokeColor": "0099FF",
+        "fillColor": "220099FF"
+      },
       "beepOnResult": true,
       "vibrateOnResult": true,
       "blinkAnimationOnResult": true,
@@ -111,7 +116,9 @@ anyline.energy = {
     {
       "captureResolution": "720p",
       "visualFeedback": {
-        "style": "contour_rect"
+        "style": "CONTOUR_RECT",
+        "strokeColor": "0099FF",
+        "fillColor": "220099FF"
       },
       "cutout": {
         "style": "rect",
@@ -164,7 +171,9 @@ anyline.energy = {
     {
       "captureResolution": "720p",
       "visualFeedback": {
-        "style": "contour_rect"
+        "style": "CONTOUR_RECT",
+        "strokeColor": "0099FF",
+        "fillColor": "220099FF"
       },
       "cutout": {
         "style": "rect",

diff --git a/example/www/js/anyline.mrz.js b/example/www/js/anyline.mrz.js
@@ -82,6 +82,11 @@ anyline.mrz = {
                 "mode": "manual",
                 "alignment": "bottom_right"
             },
+            "visualFeedback": {
+                "style": "rect",
+                "strokeColor": "0099FF",
+                "strokeWidth": 2
+            },
             "beepOnResult": true,
             "vibrateOnResult": true,
             "blinkAnimationOnResult": true,