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 179	d381c4c035cd
parent 174	1e8bbcc06a2f
child 184	c9495342d92c

equal deleted inserted replaced

-:7d45e7def548
+:d381c4c035cd
 /*
 * MyAMS
 * « My Application Management Skin »
 *
-* $Tag$ (rev. 17)
+* $Tag$ (rev. 23)
 * A bootstrap based application/administration skin
 *
 * Custom administration and application skin tools
 * Released under Zope Public License ZPL 1.1
 * ©2014-2016 Thierry Florac <tflorac@ulthar.net>
 	MyAMS.isInDOM = function(element) {
 		element = $(element);
 		if (!element.exists()) {
 			return false;
 		}
-		return globals.document.contains(element[0]);
+		return globals.document.body.contains(element[0]);
 	};
 	/**
 	 * Get script or CSS file using browser cache
 	 * Script or CSS URLs can include variable names, given between braces, as in
 			}
 			var defaults = {
 				async: typeof(callback) === 'function'
 			};
 			var settings = $.extend({}, defaults, options);
-			if (checker === undefined) {
+			if (checker instanceof Array) {
-				ams.getScript(source, function() {
+				var deferred = [];
-					if (typeof(callback) === 'function') {
+				for (var index = 0; index < checker.length; index++) {
-						callback(true, options);
+					if (checker[index] === undefined) {
+						deferred.push(ams.getScript(source[index], {async: true}));
 					}
-				}, settings);
+				}
+				if (deferred.length > 0) {
+					$.when.apply($, deferred).then(function () {
+						if (typeof(callback) === 'function') {
+							callback(true, options);
+						}
+					});
+				} else if (typeof(callback) === 'function') {
+					callback(false, options);
+				}
+			} else if (checker === undefined) {
+				if (typeof(source) === 'string') {
+					ams.getScript(source, function () {
+						if (typeof(callback) === 'function') {
+							callback(true, options);
+						}
+					}, settings);
+				}
 			} else {
 				if (typeof(callback) === 'function') {
 					callback(false, options);
 				}
 			}
 			$('.alert-danger, SPAN.state-error', form).not('.persistent').remove();
 			$('.state-error', form).removeClassPrefix('state-');
 			// Check submit button
 			var button = $(form.data('ams-submit-button'));
 			if (button && !button.data('ams-form-hide-loading')) {
+				button.data('ams-progress-content', button.html());
 				button.button('loading');
 			}
 			ams.ajax.check($.fn.ajaxSubmit,
 						   ams.baseURL + 'ext/jquery-form-3.49' + ams.devext + '.js',
 						   function() {
 									function _getProgress(handler, progress_id) {
 										var interval;
 										function _clearProgressStatus() {
-											button.button('reset');
 											clearInterval(interval);
+											ams.form.resetAfterSubmit(form, button);
+											button.html(button.data('ams-progress-content'));
 											ams.executeFunctionByName(progressEndCallback, form, button);
+											ams.form.resetChanged(form);
 										}
 										function _getProgressStatus() {
 											ams.ajax.post(handler,
 														  {progress_id: progress_id},
 															if (status === 'success') {
 																if (result.status === 'running') {
 																	if (result.message) {
 																		button.text(result.message);
 																	} else {
-																		button.text(button.data('ams-progress-text') +
+																		var text = button.data('ams-progress-text') || ams.i18n.PROGRESS;
-																					' ' + result.current + ' / ' + result.length);
+																		if (result.current) {
+																			text += ': ' + result.current + '/ ' + (result.length || 100);
+																		} else {
+																			text += '...';
+																		}
+																		button.text(text);
 																	}
 																} else if (result.status === 'finished') {
 																	_clearProgressStatus();
 																}
 															} else {
 										var modal = $(form).parents('.modal-dialog');
 										var keepModal = modal.exists() && button.exists() && button.data('ams-keep-modal');
 										if (modal.exists() && (keepModal !== true)) {
 											ams.dialog.close(form);
 										} else {
-											setTimeout(function() {
+											if (!progressHandler) {
-												ams.form.resetAfterSubmit(form, button);
+												setTimeout(function () {
-												ams.form.resetChanged(form);
+													ams.form.resetAfterSubmit(form, button);
-											}, button.data('ams-form-reset-timeout') || 2000);
+													ams.form.resetChanged(form);
+												}, button.data('ams-form-reset-timeout') || 2000);
+											}
 										}
 									}
 								}
 								var hasUpload = (form.data('ams-form-ignore-uploads') !== true) &&
 					}
 				}
 			}
 			for (name in plugins) {
+				if (!plugins.hasOwnProperty(name)) {
+					continue;
+				}
 				plugin = plugins[name];
 				if (ams.plugins.enabled[name] === undefined) {
 					ams.getScript(plugin.src, _loadPlugin, {
 						async: plugin.async === undefined ? true : plugin.async
 					});
 				var dataElement = $(this);
 				var data = dataElement.data('ams-data');
 				if (data) {
 					for (var name in data) {
 						if (data.hasOwnProperty(name)) {
-							dataElement.attr('data-' + name, data[name]);
+							var elementData = data[name];
+							if (typeof(elementData) !== 'string') {
+								elementData = JSON.stringify(elementData);
+							}
+							dataElement.attr('data-' + name, elementData);
 						}
 					}
 				}
 			});
 		},
 								if (table.hasClass('datatable')) {
 									table.dataTable().fnDeleteRow(tr[0]);
 								} else {
 									tr.remove();
 								}
+							} else {
+								MyAMS.ajax.handleJSON(result);
 							}
 						});
 					}
 				});
 			};
 				}
 				menu = $('A[href="' + hash + '"]', nav);
 				if (menu.exists()) {
 					updateActiveMenus(menu);
 				}
-				ams.skin.loadURL(url, container);
+				ams.skin.loadURL(url, container, {afterLoadCallback: function() {
-				var prefix = $('html head title').data('ams-title-prefix');
+					var prefix = $('html head title').data('ams-title-prefix');
-				document.title = (prefix ? prefix + ' > ' : '') +
+					document.title = (prefix ? prefix + ' > ' : '') +
-								 ($('[data-ams-page-title]:first', container).data('ams-page-title') ||
+						($('[data-ams-page-title]:first', container).data('ams-page-title') ||
-								  menu.attr('title') ||
+						menu.attr('title') ||
-								  document.title);
+						document.title);
+				}});
 			} else {
 				var activeUrl = $('[data-ams-active-menu]').data('ams-active-menu');
 				if (activeUrl) {
 					menu = $('A[href="' + activeUrl + '"]', nav);
 				} else {
 			if (url.startsWith('#')) {
 				url = url.substr(1);
 			}
 			if (typeof(options) === 'function') {
 				callback = options;
+				options = {};
+			} else if (options === undefined) {
 				options = {};
 			}
 			container = $(container);
 			var defaults = {
 				type: 'GET',
 				url: url,
 				dataType: 'html',
 				cache: false,
 				beforeSend: function() {
 					ams.skin.cleanContainer(container);
-					container.html('<h1 class="loading"><i class="fa fa-cog fa-spin"></i> Loading... </h1>');
+					container.html('<h1 class="loading"><i class="fa fa-cog fa-spin"></i> ' + ams.i18n.LOADING + ' </h1>');
 					if (container[0] === $('#content')[0]) {
 						ams.skin._drawBreadCrumb();
 						var prefix = $('html head title').data('ams-title-prefix');
 						document.title = (prefix ? prefix + ' > ' : '') + $('.breadcrumb LI:last-child').text();
 						$('html, body').animate({scrollTop: 0}, 'fast');
 				error: function(request, options, error) {
 					container.html('<h3 class="error"><i class="fa fa-warning txt-color-orangeDark"></i> ' +
 								   ams.i18n.ERROR + error + '</h3>' +
 								   request.responseText);
 				},
-				async: false
+				async: options.async === undefined ? true : options.async
 			};
 			var settings = $.extend({}, defaults, options);
 			$.ajax(settings);
 		},
 				if (data.amsTabLoaded) {
 					return;
 				}
 				try {
 					link.append('<i class="fa fa-spin fa-cog margin-left-5"></i>');
-					ams.skin.loadURL(data.amsUrl, link.attr('href'));
+					ams.skin.loadURL(data.amsUrl, link.attr('href'), {afterLoadCallback: function() {
-					if (data.amsTabLoadOnce) {
+						if (data.amsTabLoadOnce) {
-						link.data('ams-tab-loaded', true);
+							link.data('ams-tab-loaded', true);
-					}
+						}
+					}});
 				}
 				finally {
 					$('i', link).remove();
 				}
 			}
 		INFO: "Information",
 		WARNING: "!! WARNING !!",
 		ERROR: "ERROR: ",
+		LOADING: "Loading...",
+		PROGRESS: "Processing",
 		WAIT: "Please wait!",
 		FORM_SUBMITTED: "This form was already submitted...",
 		NO_SERVER_RESPONSE: "No response from server!",
 		ERROR_OCCURED: "An error occured!",
 		ERRORS_OCCURED: "Some errors occured!",

pyams/pyams_skin