diff --git a/highcharts/highstock/highstock.py b/highcharts/highstock/highstock.py index 659d032..e94a8c9 100644 --- a/highcharts/highstock/highstock.py +++ b/highcharts/highstock/highstock.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals, absolute_import from future.standard_library import install_aliases install_aliases() +from past.builtins import basestring from jinja2 import Environment, PackageLoader diff --git a/highcharts/highstock/highstock_types.py b/highcharts/highstock/highstock_types.py index 83e76c6..b5b31b1 100644 --- a/highcharts/highstock/highstock_types.py +++ b/highcharts/highstock/highstock_types.py @@ -211,6 +211,7 @@ "turboThreshold": int, }, "flags": { + "allowOverlapX": bool, "colors": list, "cropThreshold": int, "keys": list, @@ -350,6 +351,25 @@ "stacking": basestring, "turboThreshold": int, }, + "sma": { + "allowPointSelect": bool, + "borderWidth": [int, basestring], + "connectEnds": bool, + "connectNulls": bool, + "cropThreshold": int, + "dashStyle": basestring, + "lineWidth": int, + "linkedTo": basestring, + "marker": (Marker, dict), + "negativeColor": (ColorObject, basestring, dict), + "params": dict, + "pointInterval": int, + "pointPlacement": [basestring, int, float], + "pointStart": [int, basestring, datetime.datetime], + "shadow": [bool, dict], + "stacking": basestring, + "turboThreshold": int, + }, } DATA_SERIES_ALLOWED_OPTIONS = { diff --git a/highcharts/highstock/options.py b/highcharts/highstock/options.py index 4a21318..62e3226 100644 --- a/highcharts/highstock/options.py +++ b/highcharts/highstock/options.py @@ -320,6 +320,7 @@ class RangeSelectorOptions(BaseOptions): "buttonTheme": (SVGObject, dict), "buttons": (Buttons, list), "enabled": bool, + "floating": bool, "inputBoxBorderColor": (ColorObject, basestring, dict), "inputBoxHeight": [int, float], "inputBoxWidth": [int, float], @@ -331,6 +332,8 @@ class RangeSelectorOptions(BaseOptions): "inputStyle": (CSSObject, dict), "labelStyle": (CSSObject, dict), "selected": [int, float], + "x": int, + "y": int, } class ScrollbarOptions(BaseOptions):