Merge pull request #21 from rte-antares-rpackage/develop

master to 5.1
rte-antares-rpackage · Dec 6, 2017 · 9be3287 · 9be3287
2 parents 4f101e6 + 8a3cf4c
commit 9be3287
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: leaflet.minicharts
 Type: Package
 Title: Mini Charts for Interactive Maps
-Version: 0.5.0
+Version: 0.5.1
 Authors@R: c(
     person("Francois", "Guillem", , "[email protected]", role = c("aut", "cre")),
     person("Jalal-Edine", "ZAWAM", , "[email protected]", role = "ctb"),

diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+Changes in version 0.5.1 (2017-08-17)
+
+BUGFIXES:
+* updateMinicharts() was incapable of updating color palette (#19)
+
 Changes in version 0.5.0 (2017-07-10)
 
 NEW FEATURES:

diff --git a/inst/leaflet.minicharts.min.js b/inst/leaflet.minicharts.min.js
diff --git a/javascript/minichart_bindings.js b/javascript/minichart_bindings.js
@@ -92,11 +92,15 @@
         }
 
         if (opts[t].data.length == 1) {
-          if (opts[t].fillColor) opts[t].colors = opts[t].fillColor
+          if (opts[t].fillColor) opts[t].colors = opts[t].fillColor;
           else if (staticOpts.fillColor) opts[t].colors = staticOpts.fillColor;
           else if (l.opts[t] && l.opts[t].fillColor) opts[t].colors = l.opts[t].fillColor;
           else opts[t].colors = l.opts[0].fillColor;
-        } else opts[t].colors = l.colorPalette;
+        } else if (colorPalette) {
+          opts[t].colors = colorPalette;
+        } else {
+          opts[t].colors = l.colorPalette;
+        }
 
         if (maxValues) opts[t].maxValues = maxValues;
       }