Skip to content

Commit 6d6816f

Browse files
committed
Update highcharts.js to 4.1.10 (earliest version in npm)
1 parent 1f05e65 commit 6d6816f

File tree

9 files changed

+29
-312
lines changed

9 files changed

+29
-312
lines changed

oioioi/base/static/js/highcharts.js

Lines changed: 0 additions & 299 deletions
This file was deleted.

oioioi/base/templates/base.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
{% comment %}
1616
Load jQuery here because inlined scripts in some views depends on it.
1717
{% endcomment %}
18+
<script src="{% static 'jquery.bundle.js' %}"></script>
19+
1820
{% compress js %}
19-
<script src="{% static 'jquery.bundle.js' %}"></script>
2021
{% common_scripts %}
2122
{% endcompress %}
2223

oioioi/simpleui/static/simpleui/contest/problem.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,23 @@ var Problem = (function() {
2626
},
2727
skipClone: true
2828
},
29-
title: false,
30-
credits: false,
31-
legend: false,
29+
title: {
30+
text: undefined
31+
},
32+
credits: {
33+
enabled: false
34+
},
35+
legend: {
36+
enabled: false
37+
},
3238
xAxis: {
3339
min: 0,
3440
max: this.max_score,
3541
plotBands: false,
3642
plotLines: false,
37-
labels: false,
43+
labels: {
44+
enabled: false
45+
},
3846
title: {
3947
enabled: true,
4048
text: gettext("Score"),
@@ -48,7 +56,9 @@ var Problem = (function() {
4856
},
4957
yAxis: {
5058
min: 0,
51-
labels: false,
59+
labels: {
60+
enabled: false
61+
},
5262
title: {
5363
enabled: true,
5464
text: gettext("Participants"),

oioioi/simpleui/templates/simpleui/contest/contest.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
{% block scripts %}
1414
{{ block.super }}
15-
<script type="text/javascript" src="{% static 'js/highcharts.js' %}"></script>
15+
<script type="text/javascript" src="{% static 'highcharts/lib/highcharts.js' %}"></script>
1616
<script type="text/javascript" src="{% static 'simpleui/contest/problem.js' %}"></script>
1717
<script type="text/javascript" src="{% static 'simpleui/contest/contest.js' %}"></script>
1818
<script type="text/javascript">

oioioi/simpleui/templates/simpleui/main_dashboard/dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h1 class="inline-menu__name contest__name">{% block dashboard-name %}{% trans "
3333
{% endblock %}
3434
</nav>
3535
</header>
36-
<script type="text/javascript" src="{% static 'js/highcharts.js' %}"></script>
36+
<script type="text/javascript" src="{% static 'highcharts/lib/highcharts.js' %}"></script>
3737
{% if contests|length == 0 %}
3838
{% url 'oioioiadmin:contests_contest_add' as link %}
3939
{% if can_create_contest %}

oioioi/statistics/plottypes.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class TablePlot(PlotType):
4141
``plot_name`` table name to be used as a caption
4242
"""
4343

44-
def head_libraries(self):
45-
return ['statistics/table.css']
46-
4744
def render_plot(self, request, data, plot_id):
4845
return render_to_string('statistics/table.html', data)
4946

@@ -61,7 +58,7 @@ class StaticHighchartsPlot(PlotType):
6158
"""
6259

6360
def head_libraries(self):
64-
return ['js/highcharts.js', 'statistics/highcharts_plot.css']
61+
return ['highcharts/lib/highcharts.js']
6562

6663
def highcharts_options(self, data):
6764
"""Function generating options for Highcharts chart, as specified in

oioioi/workers/templates/workers/list_workers.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{% block title %}{% trans "Workers list" %}{% endblock %}
55

66
{% block main-content %}
7-
<script type="text/javascript" src="{% static "js/highcharts.js" %}"></script>
7+
<script type="text/javascript" src="{% static "highcharts/lib/highcharts.js" %}"></script>
88
<script type="text/javascript" src="{% static "common/load_chart.js" %}"></script>
99
<script type="text/javascript">
1010
$(function() {

package-lock.json

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"bootstrap-3-typeahead": "^4.0.2",
2121
"bootstrap-markdown": "^2.10.0",
2222
"clipboard": "^2.0.11",
23+
"highcharts": "^4.1.10",
2324
"highlight.js": "^11.11.1",
2425
"jqtree": "^1.3.8",
2526
"jquery": "^1.12.4",

0 commit comments

Comments
 (0)