Skip to content

Commit 73e5e0a

Browse files
author
Pieter Wigboldus
committed
Merged in feature/UMCAPP-80 (pull request #3)
UMCAPP-80: Add the show and hide loading messages. Approved-by: Erik de Bos <erik@way2web.nl> Approved-by: Jochem Schutte <jochem@way2web.nl>
2 parents d93d31c + 7e04c46 commit 73e5e0a

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

js/charts.core.js

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
window.Chart = (function(element, config) {
1010
'use strict';
1111

12-
var version = '2.0.0';
12+
var version = '2.1.0';
1313

1414
var highchart;
1515

@@ -143,15 +143,31 @@ window.Chart = (function(element, config) {
143143
}
144144

145145
highchart[axis][axisIndex].update(values);
146+
},
147+
148+
/**
149+
* Show the loading message.
150+
*/
151+
showLoading: function() {
152+
highchart.showLoading();
153+
},
154+
155+
/**
156+
* Hide the loading message.
157+
*/
158+
hideLoading: function() {
159+
highchart.hideLoading();
146160
}
147161
};
148162

149163
return {
150-
settings: settings,
151-
add: functions.addChart,
152-
filter: functions.filterChart,
153-
update: functions.updateChart,
154-
init: functions.init,
155-
version: version
164+
settings: settings,
165+
add: functions.addChart,
166+
filter: functions.filterChart,
167+
update: functions.updateChart,
168+
init: functions.init,
169+
showLoading: functions.showLoading,
170+
hideLoading: functions.hideLoading,
171+
version: version
156172
};
157173
});

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "way2web-highcharts",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Add highcharts to the page with ajax.",
55
"files": [
66
"js/charts.core.js"

0 commit comments

Comments
 (0)