pyams/pyams_skin: comparison src/pyams_skin/resources/js/myams.js

Mercurial Mercurial > pyams > pyams_skin / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/pyams_skin/resources/js/myams.js

changeset 547	9fe15f541572
parent 542	a6d37768ab8f
child 553	644d0f6f6503

equal deleted inserted replaced

-:9f02c09d2393
+:9fe15f541572
 										   function _submitAjaxForm(form, options) {
 											   var button,
 												   buttonData,
-												   buttonTarget;
+												   buttonTarget,
-											   var data = form.data();
+												   data = form.data(),
-											   var formOptions = data.amsFormOptions;
+												   formOptions = data.amsFormOptions,
-											   var formData;
+												   formData,
-											   var formDataCallback;
+												   formDataCallback;
-											   var progressHandler;
+											   var progressHandler,
-											   var progressInterval;
+												   progressInterval,
-											   var progressCallback;
+												   progressCallback,
-											   var progressEndCallback;
+												   progressEndCallback;
 											   // Inner progress status handler
 											   function _getProgress(handler, progress_id) {
 												   var timeout;
 													   success: function(result, status, request, form) {
 														   var modal = $(form).parents('.modal-dialog');
 														   if (modal.exists()) {
 															   ams.dialog && ams.dialog.close(form);
 														   } else {
-															   var callback;
+															   var callback,
-															   var button = form.data('ams-submit-button');
+																   button = form.data('ams-submit-button');
 															   if (button) {
 																   callback = button.data('ams-form-submit-callback');
 															   }
 															   if (!callback) {
 																   callback = ams.getFunctionByName(data.amsFormSubmitCallback) || ams.form._submitCallback;
 		 * @param this: the submitted form
 		 * @param target: the form submit container target
 		 * @param message: the optional message
 		 */
 		initSubmit: function(target, message) {
-			var form = $(this);
+			var form = $(this),
-			var spin = '<i class="fa fa-3x fa-gear fa-spin"></i>';
+				spin = '<i class="fa fa-3x fa-gear fa-spin"></i>';
 			if (!message) {
 				message = form.data('ams-form-submit-message');
 			}
 			if (message) {
 				spin += '<strong>' + message + '</strong>';
 		 *
 		 * @param this: the submitted form
 		 * @param message: the optional submit message
 		 */
 		initSubmitFooter: function(message) {
-			var form = $(this);
+			var form = $(this),
-			var spin = '<i class="fa fa-3x fa-gear fa-spin"></i>';
+				spin = '<i class="fa fa-3x fa-gear fa-spin"></i>';
 			if (!message) {
 				message = $(this).data('ams-form-submit-message');
 			}
 			if (message) {
 				spin += '<strong class="submit-message align-top padding-left-10 margin-top-10">' + message + '</strong>';
 		 *
 		 * @param this: the submitted form
 		 * @param target: the form submit container target
 		 */
 		finalizeSubmitFooter: function(/*target*/) {
-			var form = $(this);
+			var form = $(this),
-			var footer = $('footer', form);
+				footer = $('footer', form);
 			if (footer) {
 				$('.row', footer).remove();
 				$('button', footer).show();
 			}
 		},
 				if (button) {
 					button.button('reset');
 				}
 			}
-			var data = form.data();
+			var data = form.data(),
-			var dataType;
+				dataType;
 			if (data.amsFormDatatype) {
 				dataType = data.amsFormDatatype;
 			} else {
 				var response = ams.ajax && ams.ajax.getResponse(request);
 				if (response) {
 		_checkSubmitValidators: function(form) {
 			var validators = ams.form._getSubmitValidators(form);
 			if (!validators.length) {
 				return true;
 			}
-			var output = [];
+			var output = [],
-			var result = true;
+				result = true;
 			for (var index=0; index < validators.length; index++) {
-				var validator = validators[index];
+				var validator = validators[index],
-				var source = validator[0];
+					source = validator[0],
-				var handler = validator[1];
+					handler = validator[1],
-				var validatorResult = ams.executeFunctionByName(handler, form, source);
+					validatorResult = ams.executeFunctionByName(handler, form, source);
 				if (validatorResult === false) {
 					result = false;
 				} else if (typeof(validatorResult) === 'string') {
 					output.push(validatorResult);
 				} else if (result.length && (result.length > 0)) {
 		 * Flot charts
 		 */
 		chart: function(element) {
 			var charts = $('.chart', element);
 			if (charts.length > 0) {
-				ams.ajax && ams.ajax.check($.fn.plot,
+				ams.ajax && ams.ajax.check([window.Flot, $.color],
-										   ams.baseURL + 'flot/jquery.flot' + ams.devext + '.js',
+					[ams.baseURL + 'ext/flot/jquery.canvaswrapper' + ams.devext + '.js',
-										   function() {
+					 ams.baseURL + 'ext/flot/jquery.colorhelpers' + ams.devext + '.js'],
-											   charts.each(function() {
+					function () {
+						ams.ajax.check($.fn.plot,
-												   function checkPlugin(plugin) {
+							ams.baseURL + 'ext/flot/jquery.flot' + ams.devext + '.js',
-													   for (var index in $.plot.plugins) {
+							function () {
-														   if ($.plot.plugins.hasOwnProperty(index)) {
+								charts.each(function () {
-															   var pluginInfo = $.plot.plugins[index];
-															   if (pluginInfo.name === plugin) {
+									var chart = $(this),
-																   return pluginInfo;
+										data = chart.data(),
-															   }
+										dataOptions = {},
-														   }
+										plugin,
-													   }
+										flotPlugins = (data.amsChartPlugins || '').split(/\s+/);
-													   return null;
-												   }
+									function checkPlugin(plugin) {
+										for (var index in $.plot.plugins) {
-												   var chart = $(this);
+											if ($.plot.plugins.hasOwnProperty(index)) {
-												   var data = chart.data();
+												var pluginInfo = $.plot.plugins[index];
-												   var dataOptions = {};
+												if (pluginInfo.name === plugin) {
-												   var plugins = (data.amsChartPlugins || '').split(/\s+/);
+													return pluginInfo;
-												   if (plugins.length > 0) {
+												}
-													   for (var index in plugins) {
+											}
-														   if (plugins.hasOwnProperty(index)) {
+										}
-															   var pluginName = plugins[index];
+										return null;
-															   if (!checkPlugin(pluginName)) {
+									}
-																   ams.getScript(ams.baseURL + 'flot/jquery.flot.' + pluginName + ams.devext + '.js');
-															   }
+									function initChart() {
-														   }
+										var settings = $.extend({}, dataOptions, data.amsChartOptions);
-													   }
+										settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings;
-												   }
+										var chartData = data.amsChartData,
-												   var settings = $.extend({}, dataOptions, data.amsChartOptions);
+											chartDataLoader = data.amsChartDataLoader;
-												   settings = ams.executeFunctionByName(data.amsChartInitCallback, chart, settings) || settings;
+										if (chartDataLoader) {
-												   var chartData = data.amsChartData;
+											$.getJSON(chartDataLoader, chartData).done(function (data) {
-												   chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData;
+												settings = $.extend({}, settings, data.settings);
-												   var plugin = chart.plot(chartData, settings);
+												createChart(data.data, settings);
-												   ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings);
+											});
-											   });
+										} else {
-										   });
+											createChart(data, settings);
+										}
+									}
+									function createChart(chartData, settings) {
+										chartData = ams.executeFunctionByName(data.amsChartInitData, chart, chartData) || chartData;
+										plugin = chart.plot(chartData, settings);
+										ams.executeFunctionByName(data.amsChartAfterInitCallback, chart, plugin, settings);
+									}
+									var deferred = [];
+									if (flotPlugins.length > 0) {
+										for (var index in flotPlugins) {
+											if (flotPlugins.hasOwnProperty(index)) {
+												var pluginName = flotPlugins[index];
+												if (!checkPlugin(pluginName)) {
+													deferred.push(ams.getScript(ams.baseURL + 'ext/flot/jquery.flot.' + pluginName + ams.devext + '.js'));
+												}
+											}
+										}
+									}
+									if (deferred.length > 0) {
+										$.when.apply($, deferred).then(function () {
+											initChart();
+										})
+									} else {
+										initChart();
+									}
+								});
+							});
+					});
 			}
 		},
 		/**
 		 * Sparkline graphs

pyams/pyams_skin