src/myams/resources/js/myams.js
changeset 30 37ac838dfc35
parent 24 5ea89334a159
child 33 09383f711349
--- a/src/myams/resources/js/myams.js	Fri Dec 11 11:51:07 2020 +0100
+++ b/src/myams/resources/js/myams.js	Fri Dec 11 11:53:41 2020 +0100
@@ -2,7 +2,7 @@
  * MyAMS
  * « My Application Management Skin »
  *
- * Version: 0.1.44 (rev. 1)
+ * Version: 0.1.45 (rev. 1)
  * A bootstrap based application/administration skin
  *
  * Custom administration and application skin tools
@@ -5078,73 +5078,78 @@
 		chart: function(element) {
 			var charts = $('.chart', element);
 			if (charts.length > 0) {
-				ams.ajax && ams.ajax.check([window.Flot, $.color],
-					[ams.baseURL + 'ext/flot/jquery.canvaswrapper' + ams.devext + '.js',
-					 ams.baseURL + 'ext/flot/jquery.colorhelpers' + ams.devext + '.js'],
-					function () {
-						ams.ajax.check($.plot,
-							ams.baseURL + 'ext/flot/jquery.flot' + ams.devext + '.js',
-							function () {
-
-								var flotPlugins = new Set();
-								charts.each(function() {
-									var chart = $(this),
-										data = chart.data(),
-										chartPlugins = (data.amsChartPlugins || '').split(/\s+/);
-									$.each(chartPlugins, function(idx, elt) {
-										flotPlugins.add(elt);
-									});
+				ams.ajax && ams.ajax.check([
+					$.event.special.mousewheel,
+					window.Flot,
+					$.color
+				], [
+					ams.baseURL + 'ext/jquery-mousewheel' + ams.devext + '.js',
+					ams.baseURL + 'ext/flot/jquery.canvaswrapper' + ams.devext + '.js',
+					ams.baseURL + 'ext/flot/jquery.colorhelpers' + ams.devext + '.js'
+				], function () {
+					ams.ajax.check($.plot,
+						ams.baseURL + 'ext/flot/jquery.flot' + ams.devext + '.js',
+						function () {
+
+							var flotPlugins = new Set();
+							charts.each(function() {
+								var chart = $(this),
+									data = chart.data(),
+									chartPlugins = (data.amsChartPlugins || '').split(/\s+/);
+								$.each(chartPlugins, function(idx, elt) {
+									flotPlugins.add(elt);
 								});
-
-								function checkPlugin(plugin) {
-									for (var index in $.plot.plugins) {
-										if ($.plot.plugins.hasOwnProperty(index)) {
-											var pluginInfo = $.plot.plugins[index];
-											if (pluginInfo.name === plugin) {
-												return pluginInfo;
-											}
+							});
+
+							function checkPlugin(plugin) {
+								for (var index in $.plot.plugins) {
+									if ($.plot.plugins.hasOwnProperty(index)) {
+										var pluginInfo = $.plot.plugins[index];
+										if (pluginInfo.name === plugin) {
+											return pluginInfo;
 										}
 									}
-									return null;
 								}
-
-								var deferred = [];
-								for (var pluginName of flotPlugins.values()) {
-									if (!checkPlugin(pluginName)) {
-										deferred.push(ams.getScript(ams.baseURL + 'ext/flot/jquery.flot.' + pluginName + ams.devext + '.js'));
-									}
+								return null;
+							}
+
+							var deferred = [];
+							for (var pluginName of flotPlugins.values()) {
+								if (!checkPlugin(pluginName)) {
+									deferred.push(ams.getScript(ams.baseURL + 'ext/flot/jquery.flot.' + pluginName + ams.devext + '.js'));
 								}
-
-								$.when.apply($, deferred).then(function() {
-
-									charts.each(function() {
-
-										var chart = $(this),
-											data = chart.data(),
-											dataOptions = {};
-
-										function createChart(chartData, settings) {
-											chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData;
-											var plugin = chart.plot(chartData, settings);
-											ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings);
-										}
-
-										var settings = $.extend({}, dataOptions, data.amsChartOptions);
-										settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings;
-										var chartData = data.amsChartData,
-											chartDataLoader = data.amsChartDataLoader;
-										if (chartDataLoader) {
-											$.getJSON(chartDataLoader, chartData).done(function(data) {
-												settings = $.extend({}, settings, data.settings);
-												createChart(data.data, settings);
-											});
-										} else {
-											createChart(chartData, settings);
-										}
-
-									});
+							}
+
+							$.when.apply($, deferred).then(function() {
+
+								charts.each(function() {
+
+									var chart = $(this),
+										data = chart.data(),
+										dataOptions = {};
+
+									function createChart(chartData, settings) {
+										chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData;
+										var plugin = chart.plot(chartData, settings);
+										ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings);
+									}
+
+									var settings = $.extend({}, dataOptions, data.amsChartOptions);
+									settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings;
+									var chartData = data.amsChartData,
+										chartDataLoader = data.amsChartDataLoader;
+									if (chartDataLoader) {
+										$.getJSON(chartDataLoader, chartData).done(function(data) {
+											settings = $.extend({}, settings, data.settings);
+											createChart(data.data, settings);
+										});
+									} else {
+										createChart(chartData, settings);
+									}
+
 								});
 							});
+						});
 					});
 			}
 		},