src/pyams_skin/resources/js/myams.js
changeset 321 87fe0eaced17
parent 318 2ab5b80afa3f
child 327 237378166902
--- a/src/pyams_skin/resources/js/myams.js	Wed May 23 15:12:19 2018 +0200
+++ b/src/pyams_skin/resources/js/myams.js	Wed May 23 15:13:18 2018 +0200
@@ -5618,10 +5618,13 @@
 						ams.stats.logPageview();
 					}
 				},
-				error: function(request, options, error) {
+				error: function(request, errorOptions, error) {
 					container.html('<h3 class="error"><i class="fa fa-warning txt-color-orangeDark"></i> ' +
 								   ams.i18n.ERROR + error + '</h3>' +
 								   request.responseText);
+					if (options && options.afterErrorCallback) {
+						ams.executeFunctionByName(options.afterErrorCallback, this);
+					}
 				},
 				async: options.async === undefined ? true : options.async
 			};
@@ -6173,22 +6176,26 @@
 		// Enable tabs dynamic loading
 		$(document).on('show.bs.tab', function(e) {
 			var link = $(e.target);
+			if (link.exists() && (link.get(0).tagName !== 'A')) {
+				link = $('a[href]', link);
+			}
 			var data = link.data();
 			if (data.amsUrl) {
 				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'), {afterLoadCallback: function() {
+				link.append('<i class="fa fa-spin fa-cog margin-left-5"></i>');
+				ams.skin.loadURL(data.amsUrl, link.attr('href'), {
+					afterLoadCallback: function() {
 						if (data.amsTabLoadOnce) {
 							link.data('ams-tab-loaded', true);
 						}
-					}});
-				}
-				finally {
-					$('i', link).remove();
-				}
+						$('i', link).remove();
+					},
+					afterErrorCallback: function() {
+						$('i', link).remove();
+					}
+				});
 			}
 		});