ztfy/ztfy.myams: comparison src/ztfy/myams/resources/js/myams.js

Mercurial Mercurial > ztfy > ztfy.myams / comparison

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

src/ztfy/myams/resources/js/myams.js

changeset 193	68dd5a05c059
parent 192	d58af89193e3
child 196	bbeb090d73e9

equal deleted inserted replaced

-:d58af89193e3
+:68dd5a05c059
 	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);
 				}
 			}
 					}
 				}
 			}
 			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...",
 		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!",

ztfy/ztfy.myams