Skip to content

Highmaps bugfix and CSSsource clear. #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Highmaps bugfix and CSSsource clear. #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0238fdc
Fixed JSON parsing on highmaps.add_map_data
zottacko Jan 18, 2023
c0f816e
Updated Highmaps Headers
zottacko Jan 18, 2023
8a55687
Cleared CSSsource on highcharts.py
zottacko Jan 18, 2023
43eb087
Cleared CSSsource on highstock.py
zottacko Jan 18, 2023
bb43cde
Update highmaps.py
zottacko Feb 24, 2023
6318673
Added highcharts specification
zottacko Feb 24, 2023
d325e2f
Drilldown version 9
zottacko Feb 24, 2023
8002ef9
Drilldown version 9
zottacko Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions highcharts/highcharts/highcharts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ def __init__(self, **kwargs):
]

# set CSS src
self.CSSsource = [
'https://www.highcharts.com/highslide/highslide.css',

]
self.CSSsource = []

self.offline = kwargs.get("offline", False)

Expand Down Expand Up @@ -340,7 +337,7 @@ def buildhtmlheader(self):
"""generate HTML header content"""

if self.drilldown_flag:
self.add_JSsource('http://code.highcharts.com/modules/drilldown.js')
self.add_JSsource('https://code.highcharts.com/9/modules/drilldown.js')



Expand Down
16 changes: 7 additions & 9 deletions highcharts/highmaps/highmaps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,15 @@ def __init__(self, **kwargs):
# Set Javascript src
self.JSsource = [
'https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js',
'https://code.highcharts.com/maps/6/highmaps.js',
'https://code.highcharts.com/6/highcharts.js',
'https://code.highcharts.com/maps/6/modules/map.js',
'https://code.highcharts.com/maps/6/modules/data.js',
'https://code.highcharts.com/maps/6/modules/exporting.js'
'https://code.highcharts.com/maps/9/highmaps.js',
'https://code.highcharts.com/9/highcharts.js',
'https://code.highcharts.com/maps/9/modules/map.js',
'https://code.highcharts.com/maps/9/modules/data.js',
'https://code.highcharts.com/maps/9/modules/exporting.js'
]

# set CSS src
self.CSSsource = [
'https://www.highcharts.com/highslide/highslide.css',
]
self.CSSsource = []
# Set data
self.data = []
self.data_temp = []
Expand Down Expand Up @@ -380,7 +378,7 @@ def buildhtmlheader(self):
#Highcharts lib/ needs to make sure it's up to date

if self.drilldown_flag:
self.add_JSsource('https://code.highcharts.com/maps/modules/drilldown.js')
self.add_JSsource('https://code.highcharts.com/maps/9/modules/drilldown.js')

self.header_css = [
'<link href="%s" rel="stylesheet" />' % h for h in self.CSSsource
Expand Down
2 changes: 1 addition & 1 deletion highcharts/highmaps/templates/content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
var option = {{chart.option}};

{% if chart.mapdata_flag %}
var geojson = {{chart.mapdata}}
var geojson = $.parseJSON({{chart.mapdata}});
{% endif %}

var data = {{chart.data}};
Expand Down
5 changes: 1 addition & 4 deletions highcharts/highstock/highstock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ def __init__(self, **kwargs):
]

# set CSS src
self.CSSsource = [
'https://www.highcharts.com/highslide/highslide.css',

]
self.CSSsource = []
# set data
self.data = []
self.data_temp = []
Expand Down