Merge branch 'master' into add-hist-to-facet

Kully · web-flow · commit 2e7fecbf90ee · 2017-06-30T15:47:34.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [2.0.12] - UNRELEASED
 ### Updated
-- Updated `plotly.min.js` to version 1.28.2 for `plotly.offline`.
-  - See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1282----2017-06-21) for additional information regarding the updates.
+- Updated `plotly.min.js` to version 1.28.3 for `plotly.offline`.
+  - See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1283----2017-06-26) for additional information regarding the updates.
 ### Added
 - `figure_factory.create_facet_grid` now supports histogram, bar, and box traces.
 
diff --git a/plotly/figure_factory/_facet_grid.py b/plotly/figure_factory/_facet_grid.py
@@ -446,7 +446,7 @@ def _facet_grid_color_numerical(df, x, y, facet_row, facet_col, color_name,
                     trace = dict(
                         type=trace_type,
                         showlegend=False,
-                        **kwargs
+                        **kwargs_trace
                     )
 
                 if x:
@@ -883,7 +883,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                     )
     show_legend = False
     if color_name:
-        if isinstance(df[color_name][0], str) or color_is_cat:
+        if isinstance(df[color_name].iloc[0], str) or color_is_cat:
             show_legend = True
             if isinstance(colormap, dict):
                 utils.validate_colors_dict(colormap, 'rgb')
@@ -912,7 +912,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
                 SUBPLOT_SPACING, marker_color, kwargs_trace, kwargs_marker
             )
 
-        elif isinstance(df[color_name][0], Number):
+        elif isinstance(df[color_name].iloc[0], Number):
             if isinstance(colormap, dict):
                 show_legend = True
                 utils.validate_colors_dict(colormap, 'rgb')
diff --git a/plotly/package_data/plotly.min.js b/plotly/package_data/plotly.min.js
diff --git a/plotly/tests/test_optional/test_figure_factory.py b/plotly/tests/test_optional/test_figure_factory.py
@@ -2009,6 +2009,7 @@ def test_valid_color_dict(self):
                                 data, 'a', 'b', color_name='a',
                                 colormap=color_dict)
 
+
     def test_valid_colorscale_name(self):
         data = pd.DataFrame([[0, 1, 2], [3, 4, 5]],
                             columns=['a', 'b', 'c'])
