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 69	a361355b55c7
parent 64	3fe1d315747c
child 72	13f5fdd06484

equal deleted inserted replaced

-:fd8fb93e1b6a
+:a361355b55c7
 	/**
 	 * Get MyAMS base URL
 	 * Copyright Andrew Davy: https://forrst.com/posts/Get_the_URL_of_the_current_javascript_file-Dst
 	 */
 	MyAMS.baseURL = (function () {
-		var script = $('script[src$="/myams.js"], script[src$="/myams.min.js"]');
+		var script = $('script[src*="/myams.js"], script[src*="/myams.min.js"]');
 		var src = script.attr("src");
-		ams.devmode = !src.endsWith('.min.js');
+		ams.devmode = src.indexOf('.min.js') < 0;
 		ams.devext = ams.devmode ? '' : '.min';
 		return src.substring(0, src.lastIndexOf('/') + 1);
 	})();
 		 *  - @options: additional JSON-RPC procedure parameters
 		 *  - @callback: name of a callback which will be called on server response
 		 */
 		query: function(query, method, options, callback) {
 			ams.ajax.check($.jsonRpc,
-						   ams.baseURL + 'ext/jquery-jsonrpc' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/jquery-jsonrpc' + ams.devext + '.js',
 						   function() {
 								var result;
 								if (typeof(options) == 'function') {
 									callback = options;
 									options = {};
 		 *  - @options: additional JSON-RPC method call parameters
 		 *  - @callback: name of a callback which will be called on server response
 		 */
 		post: function(method, data, options, callback) {
 			ams.ajax.check($.jsonRPC,
-						   ams.baseURL + 'ext/jquery-jsonrpc' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/jquery-jsonrpc' + ams.devext + '.js',
 						   function() {
 								var result;
 								if (typeof(options) == 'function') {
 									callback = options;
 									options = {};
 		 *  - @options: additional JSON-RPC procedure parameters
 		 *  - @callback: name of a callback which will be called on server response
 		 */
 		post: function(url, method, data, options, callback) {
 			ams.ajax.check($.xmlrpc,
-						   ams.baseURL + 'ext/jquery-xmlrpc' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/jquery-xmlrpc' + ams.devext + '.js',
 						   function() {
 								var result;
 								if (typeof(options) == 'function') {
 									callback = options;
 									options = {};
 			// Remove remaining status messages
 			$('.alert, SPAN.state-error', form).remove();
 			$('.state-error', form).removeClassPrefix('state-');
 			// Check submit button
 			var button = $(form.data('ams-submit-button'));
-			if (button)
+			if (button && !button.data('ams-form-hide-loading'))
 				button.button('loading');
 			ams.ajax.check($.fn.ajaxSubmit,
-						   ams.baseURL + 'ext/jquery-form-3.49' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/jquery-form-3.49' + ams.devext + '.js',
 						   function() {
 								function _submitAjaxForm(form, options) {
 									var button;
 									// JQuery-progressbar plug-in must be loaded synchronously!!
 									// Otherwise, hidden input fields created by jquery-validate plug-in
 									// and matching named buttons will be deleted (on first form submit)
 									// before JQuery-form plug-in can get them when submitting the form...
 									ams.ajax.check($.progressBar,
-												   ams.baseURL + 'ext/jquery-progressbar' + (ams.devmode ? '.js' : '.min.js'));
+												   ams.baseURL + 'ext/jquery-progressbar' + ams.devext + '.js');
 									var settings = $.extend({}, {
 										uuid: $.progressBar.submit(form)
 									});
 									_submitAjaxForm(form, settings);
 								} else
 			} else if (errors instanceof Array) {
 				var header = errors.length == 1 ? ams.i18n.ERROR_OCCURED : ams.i18n.ERRORS_OCCURED;
 				ams.skin.alert(form, 'error', header, errors);
 			} else {
 				$('.state-error', form).removeClass('state-error');
-				header = errors.widgets && (errors.widgets.length > 1) ? ams.i18n.ERRORS_OCCURED : ams.i18n.ERROR_OCCURED;
+				header = errors.error_header ||
+						 (errors.widgets && (errors.widgets.length > 1) ? ams.i18n.ERRORS_OCCURED : ams.i18n.ERROR_OCCURED);
 				var message = new Array();
 				var index;
 				for (index in errors.messages) {
 					if (!$.isNumeric(index))
 						continue;
-					message.push(errors.messages[index].message || errors.messages[index]);
+					if (errors.messages[index].header) {
+						message.push('<strong>' + errors.messages[index].header + '</strong><br />' + errors.messages[index].message);
+					} else {
+						message.push(errors.messages[index].message || errors.messages[index]);
+					}
 				}
 				for (index in errors.widgets) {
 					if (!$.isNumeric(index))
 						continue;
 					// set widget status message
 						$('li:nth-child(' + tab_index + ')', nav_tabs).removeClassPrefix('state-')
 																	  .addClass('state-error');
 						$('li.state-error:first a', form).click();
 					}
 				}
-				ams.skin.alert(form, 'error', header, message, errors.error_message);
+				ams.skin.alert(form, errors.error_level || 'error', header, message, errors.error_message);
 			}
 		}
 	};
 		/**
 		 * Modal dialog opener
 		 */
 		open: function(source, options) {
 			ams.ajax.check($.fn.modalmanager,
-						   ams.baseURL + 'ext/bootstrap-modalmanager' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'ext/bootstrap-modalmanager' + ams.devext + '.js',
 						   function() {
 								ams.ajax.check($.fn.modal.defaults,
-											   ams.baseURL + 'ext/bootstrap-modal' + (ams.devmode ? '.js' : '.min.js'),
+											   ams.baseURL + 'ext/bootstrap-modal' + ams.devext + '.js',
 								function(first_load) {
 									if (first_load) {
 										$(document).off('click.modal');
 										$.fn.modal.defaults.spinner = $.fn.modalmanager.defaults.spinner =
 											'<div class="loading-spinner" style="width: 200px; margin-left: -100px;">' +
 		 * Modals hidden callback
 		 * This callback can be used to clean contents added by plug-ins
 		 */
 		hidden: function(e) {
 			var modal = e.target;
+			// Call registered cleaning callbacks
+			ams.skin.cleanContainer(modal);
+			// Call registered hide callbacks
 			var callbacks = ams.dialog._hide_callbacks;
 			for (var index in callbacks) {
 				callbacks[index].call(modal);
 			}
 		}
 				for (var name in plugins) {
 					disabled.push(plugins[name]);
 				}
 			});
-			// Run already enabled plug-ins
+			// Load and register new plug-ins
-			for (var index in ams.plugins.enabled) {
-				if (disabled.indexOf(index) >= 0)
-					continue;
-				var plugin = ams.plugins.enabled[index];
-				if (typeof(plugin) == 'function')
-					plugin(element);
-			}
-			// Load, run and register new plug-ins
 			var name;
 			$('[data-ams-plugins]', element).each(function() {
 				var source = $(this);
 				var plugins = {}
 				if (typeof(source.data('ams-plugins')) === 'string') {
 						var plugin = plugins[name];
 						ams.getScript(plugin.src, function() {
 							var callback = plugin.callback;
 							if (callback) {
 								var called = ams.getFunctionByName(callback);
-								if (typeof(called) == 'function')
-									called.apply(source);
 								if (plugin.register !== false)
 									ams.plugins.enabled[name] = called;
 							} else {
 								if (plugin.register !== false)
 									ams.plugins.enabled[name] = null;
 							async: plugin.async === undefined ? true : plugin.async
 						});
 					}
 				}
 			});
+			// Run all enabled plug-ins
+			for (var index in ams.plugins.enabled) {
+				if (disabled.indexOf(index) >= 0)
+					continue;
+				var plugin = ams.plugins.enabled[index];
+				if (typeof(plugin) == 'function')
+					plugin(element);
+			}
 		},
 		/**
 		 * Data initializer
 		 * This plug-in converts a single JSON "data-ams-data" attribute into a set of several equivalent "data-" attributes.
 			 */
 			hint: function(element) {
 				var hints = $('.hint:not(:parents(.nohints))', element);
 				if (hints.length > 0)
 					ams.ajax.check($.fn.tipsy,
-								   ams.baseURL + 'ext/jquery-tipsy' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-tipsy' + ams.devext + '.js',
 								   function() {
-										ams.getCSS(ams.baseURL + '../css/ext/jquery-tipsy' + (ams.devmode ? '.css' : '.min.css'),
+										ams.getCSS(ams.baseURL + '../css/ext/jquery-tipsy' + ams.devext + '.css',
 												  'jquery-tipsy');
 										hints.each(function() {
 											var hint = $(this);
 											var data = hint.data();
 											var data_options = {
 													var hint = $(this);
 													return hint.attr('original-title') ||
 														   hint.attr(data.amsHintTitleAttr || 'title') ||
 														   (data.amsHintHtml ? hint.html() : hint.text());
 												},
-												opacity: data.amsHintOpacity,
+												opacity: data.amsHintOpacity || 0.95,
 												gravity: data.amsHintGravity || 'sw',
 												offset: data.amsHintOffset || 0
 											};
 											var settings = $.extend({}, data_options, data.amsHintOptions);
 											settings = ams.executeFunctionByName(data.amsHintInitCallback, hint, settings) || settings;
 											var plugin = hint.tipsy(settings);
 											ams.executeFunctionByName(data.amsHintAfterInitCallback, hint, plugin, settings);
 										});
 								   });
+			},
+			/**
+			 * Context menu plug-in
+			 */
+			contextMenu: function(element) {
+				var menus = $('.context-menu', element);
+				if (menus.length > 0) {
+					menus.each(function() {
+						var menu = $(this);
+						var data = menu.data();
+						var data_options = {
+							menuSelector: data.amsContextmenuSelector,
+							menuSelected: ams.helpers.contextMenuHandler
+						};
+						var settings = $.extend({}, data_options, data.amsContextmenuOptions);
+						settings = ams.executeFunctionByName(data.amsContextmenuInitCallback, menu, settings) || settings;
+						var plugin = menu.contextMenu(settings);
+						ams.executeFunctionByName(data.amsContextmenuAfterInitCallback, menu, plugin, settings);
+					});
+				}
 			},
 			/**
 			 * Fieldset legend switcher
 			 */
 							input.attr('disabled', 'disabled');
 						} else {
 							input.on('change', function(e) {
 								e.preventDefault();
 								var veto = {};
+								var isChecked = $(this).is(':checked');
 								legend.trigger('ams.checker.before-switch', [legend, veto]);
-								if (veto.veto)
+								if (veto.veto) {
+									// reset checked status because event is fired after change...
+									$(this).prop('checked', !isChecked);
 									return;
-								var isChecked = $(this).is(':checked');
+								}
 								ams.executeFunctionByName(data.amsCheckerChangeHandler, legend, isChecked);
 								if (!data.amsCheckerCancelDefault) {
 									var hidden = input.data('ams-checker-hidden-input');
 									if (isChecked) {
 										if (data.amsCheckerMode == 'disable')
 											hidden.val(checkedValue);
 										$('[data-required]', fieldset).attr('required', 'required');
 										legend.trigger('ams.checker.opened', [legend]);
 									} else {
 										if (data.amsCheckerMode == 'disable')
-											fieldset.attr('disabled', 'disabled');
+											fieldset.prop('disabled', 'disabled');
 										else
 											fieldset.addClass('switched');
 										if (hidden)
 											hidden.val(uncheckedValue);
 										$('[data-required]', fieldset).removeAttr('required');
 					});
 				}
 			},
 			/**
-			 * Context menu plug-in
+			 * JQuery typeahead plug-in
 			 */
-			contextMenu: function(element) {
+			typeahead: function(element) {
-				var menus = $('.context-menu', element);
+				var typeaheads = $('.typeahead', element);
-				if (menus.length > 0) {
+				if (typeaheads.length > 0) {
-					menus.each(function() {
+					ams.ajax.check($.fn.typeahead,
-						var menu = $(this);
+								   ams.baseURL + 'ext/jquery-typeahead' + ams.devext + '.js',
-						var data = menu.data();
+								   function() {
-						var data_options = {
+										typeaheads.each(function() {
-							menuSelector: data.amsContextmenuSelector,
+											var input = $(this);
-							menuSelected: ams.helpers.contextMenuHandler
+											var data = input.data();
-						};
+											var data_options = {};
-						var settings = $.extend({}, data_options, data.amsContextmenuOptions);
+											var settings = $.extend({}, data_options, data.amsTypeaheadOptions);
-						settings = ams.executeFunctionByName(data.amsContextmenuInitCallback, menu, settings) || settings;
+											settings = ams.executeFunctionByName(data.amsTypeaheadInitCallback, input, settings) || settings;
-						var plugin = menu.contextMenu(settings);
+											var plugin = input.typeahead(settings);
-						ams.executeFunctionByName(data.amsContextmenuAfterInitCallback, menu, plugin, settings);
+											ams.executeFunctionByName(data.amsTypeaheadAfterInitCallback, input, plugin, settings);
-					});
+										});
+								   });
 				}
 			},
 			/**
 			 * Select2 plug-in
 			 */
 			select2: function(element) {
 				var selects = $('.select2', element);
 				if (selects.length > 0) {
 					ams.ajax.check($.fn.select2,
-								   ams.baseURL + 'ext/jquery-select2-3.5.2' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-select2-3.5.2' + ams.devext + '.js',
 								   function() {
 										selects.each(function() {
 											var select = $(this);
 											var data = select.data();
 											var data_options = {
 												default:
 													break;
 											}
 											if (select.attr('readonly')) {
-												data_options.query = function() {
+												if (select.attr('type') == 'hidden') {
-													return [];
+													data_options.query = function () {
-												};
+														return [];
+													};
+												}
 											} else if (data.amsSelect2Query) {
 												// Custom query method
 												data_options.query = ams.getFunctionByName(data.amsSelect2Query);
 												data_options.minimumInputLength = data.amsSelect2MinimumInputLength || 1;
 											} else if (data.amsSelect2QueryUrl) {
 													settings.params[data.amsSelect2PageParamName || 'page'] = options.page;
 													settings.params[data.amsSelect2ContextParamName || 'context'] = options.context;
 													settings = $.extend({}, settings, data.amsSelect2QueryOptions);
 													settings = ams.executeFunctionByName(data.amsSelect2QueryInitCallback, select, settings) || settings;
 													ams.ajax.check($.jsonRPC,
-																   ams.baseURL + 'ext/jquery-jsonrpc' + (ams.devmode ? '.js' : '.min.js'),
+																   ams.baseURL + 'ext/jquery-jsonrpc' + ams.devext + '.js',
 																   function() {
 																		$.jsonRPC.withOptions({
 																			endPoint: data.amsSelect2MethodTarget || ams.jsonrpc.getAddr(),
 																			namespace: data.amsSelect2MethodNamespace,
 																			cache: false
 											var settings = $.extend({}, data_options, data.amsSelect2Options);
 											settings = ams.executeFunctionByName(data.amsSelect2InitCallback, select, settings) || settings;
 											var plugin = select.select2(settings);
 											ams.executeFunctionByName(data.amsSelect2AfterInitCallback, select, plugin, settings);
 											if (select.hasClass('ordered')) {
-												select.addClass('nofloat');
 												ams.ajax.check($.fn.select2Sortable,
-															   ams.baseURL + 'ext/jquery-select2-sortable' + (ams.devmode ? '.js' : '.min.js'),
+															   ams.baseURL + 'ext/jquery-select2-sortable' + ams.devext + '.js',
 															   function() {
 																	select.select2Sortable({
 																		bindOrder: 'sortableStop'
 																	});
 															   });
 			 */
 			datepicker: function(element) {
 				var datepickers = $('.datepicker', element);
 				if (datepickers.length > 0) {
 					ams.ajax.check($.fn.datetimepicker,
-								   ams.baseURL + 'ext/jquery-datetimepicker' + (ams.devmode ? '.js': '.min.js'),
+								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										datepickers.each(function() {
 											var input = $(this);
 											var data = input.data();
 			 */
 			datetimepicker: function(element) {
 				var datetimepickers = $('.datetimepicker', element);
 				if (datetimepickers.length > 0) {
 					ams.ajax.check($.fn.datetimepicker,
-								   ams.baseURL + 'ext/jquery-datetimepicker' + (ams.devmode ? '.js': '.min.js'),
+								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										datetimepickers.each(function() {
 											var input = $(this);
 											var data = input.data();
 			 */
 			timepicker: function(element) {
 				var timepickers = $('.timepicker', element);
 				if (timepickers.length > 0) {
 					ams.ajax.check($.fn.datetimepicker,
-								   ams.baseURL + 'ext/jquery-datetimepicker' + (ams.devmode ? '.js': '.min.js'),
+								   ams.baseURL + 'ext/jquery-datetimepicker' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + (ams.devmode ? '.css' : '.min.css'), 'jquery-datetimepicker');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-datetimepicker' + ams.devext + '.css', 'jquery-datetimepicker');
 											ams.dialog.registerHideCallback(ams.helpers.datetimepickerDialogHiddenCallback);
 										}
 										timepickers.each(function() {
 											var input = $(this);
 											var data = input.data();
 			 */
 			colorpicker: function(element) {
 				var colorpickers = $('.colorpicker', element);
 				if (colorpickers.length > 0) {
 					ams.ajax.check($.fn.minicolors,
-								   ams.baseURL + 'ext/jquery-minicolors' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-minicolors' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-minicolors' + (ams.devmode ? '.css' : '.min.css'), 'jquery-minicolors');
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-minicolors' + ams.devext + '.css', 'jquery-minicolors');
 										}
 										colorpickers.each(function() {
 											var input = $(this);
 											var data = input.data();
 											var data_options = {
 								   });
 				}
 			},
 			/**
-			 * JQuery typeahead plug-in
-			 */
-			typeahead: function(element) {
-				var typeaheads = $('.typeahead', element);
-				if (typeaheads.length > 0) {
-					ams.ajax.check($.fn.typeahead,
-								   ams.baseURL + 'ext/jquery-typeahead' + (ams.devmode ? '.js' : '.min.js'),
-								   function() {
-										typeaheads.each(function() {
-											var input = $(this);
-											var data = input.data();
-											var data_options = {};
-											var settings = $.extend({}, data_options, data.amsTypeaheadOptions);
-											settings = ams.executeFunctionByName(data.amsTypeaheadInitCallback, input, settings) || settings;
-											var plugin = input.typeahead(settings);
-											ams.executeFunctionByName(data.amsTypeaheadAfterInitCallback, input, plugin, settings);
-										});
-								   });
-				}
-			},
-			/**
 			 * JQuery validation plug-in
 			 */
 			validate: function(element) {
 				var forms = $('FORM:not([novalidate])', element);
 				if (forms.length > 0) {
 					ams.ajax.check($.fn.validate,
-								   ams.baseURL + 'ext/jquery-validate-1.11.1' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-validate-1.11.1' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
 											$.validator.setDefaults({
 												highlight: function(element) {
 													$(element).closest('.form-group, label:not(:parents(.form-group))').addClass('state-error');
 																		// Otherwise, hidden input fields created by jquery-validate plug-in
 																		// and matching named buttons will be deleted (on first form submit)
 																		// before JQuery-form plug-in can get them when submitting the form...
 																		$('.state-error', form).removeClass('state-error');
 																		ams.ajax.check($.fn.ajaxSubmit,
-																					   ams.baseURL + 'ext/jquery-form-3.49' + (ams.devmode ? '.js' : '.min.js'));
+																					   ams.baseURL + 'ext/jquery-form-3.49' + ams.devext + '.js');
 																		return ams.form.submit(form);
 																	}
 																	: ams.getFunctionByName(data.amsFormSubmitHandler)
 															   : undefined,
 												invalidHandler: form.attr('data-async') !== undefined
 			 */
 			datatable: function(element) {
 				var tables = $('.datatable', element);
 				if (tables.length > 0) {
 					ams.ajax.check($.fn.dataTable,
-								   ams.baseURL + 'ext/jquery-dataTables-1.9.4' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-dataTables-1.9.4' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load) {
 											$.fn.dataTableExt.oSort['numeric-comma-asc']  = function(a, b) {
 												var x = a.replace(/,/, ".").replace(/ /g, '');
 												var y = b.replace(/,/, ".").replace(/ /g, '');
 												return ((x < y) ?  1 : ((x > y) ? -1 : 0));
 											};
 										}
 										$(tables).each(function() {
 											ams.ajax.check($.fn.dataTableExt.oPagination['bootstrap_full'],
-														   ams.baseURL + 'myams-dataTables' + (ams.devmode ? '.js' : '.min.js'));
+														   ams.baseURL + 'myams-dataTables' + ams.devext + '.js');
 											var table = $(this);
 											var data = table.data();
 											var extensions = (data.amsDatatableExtensions || '').split(/\s+/);
 											var sDom = data.amsDatatableSdom ||
 												"W" +
 												bJQueryUI: false,
 												bFilter: data.amsDatatableGlobalFilter !== false,
 												bPaginate: data.amsDatatablePagination !== false,
 												bInfo: data.amsDatatableInfo !== false,
 												bSort: data.amsDatatableSort !== false,
+												aaSorting: data.amsDatatableSorting,
 												bDeferRender: true,
 												bAutoWidth: false,
 												iDisplayLength: data.amsDatatableDisplayLength || 25,
 												sPaginationType: data.amsDatatablePaginationType || 'bootstrap_full',
 												sDom: sDom,
 											if (extensions.length > 0) {
 												for (index in extensions) {
 													switch (extensions[index]) {
 														case 'autofill':
 															ams.ajax.check($.fn.dataTable.AutoFill,
-																		   ams.baseURL + 'ext/jquery-dataTables-autoFill' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-autoFill' + ams.devext + '.js');
 															break;
 														case 'columnfilter':
 															ams.ajax.check($.fn.columnFilter,
-																		   ams.baseURL + 'ext/jquery-dataTables-columnFilter' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-columnFilter' + ams.devext + '.js');
 															break;
 														case 'colreorder':
 															ams.ajax.check($.fn.dataTable.ColReorder,
-																		   ams.baseURL + 'ext/jquery-dataTables-colReorder' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-colReorder' + ams.devext + '.js');
 															break;
 														case 'colreorderwithresize':
 															ams.ajax.check($.fn.dataTable.ColReorder,
-																		   ams.baseURL + 'ext/jquery-dataTables-colReorderWithResize' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-colReorderWithResize' + ams.devext + '.js');
 															break;
 														case 'colvis':
 															ams.ajax.check($.fn.dataTable.ColVis,
-																		   ams.baseURL + 'ext/jquery-dataTables-colVis' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-colVis' + ams.devext + '.js');
 															var cv_default = {
 																activate: 'click',
 																sAlign: 'right'
 															};
 															settings.oColVis = $.extend({}, cv_default, data.amsDatatableColvisOptions);
 															break;
 														case 'editable':
 															ams.ajax.check($.fn.editable,
-																		   ams.baseURL + 'ext/jquery-jeditable' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-jeditable' + ams.devext + '.js');
 															ams.ajax.check($.fn.makeEditable,
-																		   ams.baseURL + 'ext/jquery-dataTables-editable' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-editable' + ams.devext + '.js');
 															break;
 														case 'fixedcolumns':
 															ams.ajax.check($.fn.dataTable.FixedColumns,
-																		   ams.baseURL + 'ext/jquery-dataTables-fixedColumns' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-fixedColumns' + ams.devext + '.js');
 															break;
 														case 'fixedheader':
 															ams.ajax.check($.fn.dataTable.FixedHeader,
-																		   ams.baseURL + 'ext/jquery-dataTables-fixedHeader' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-fixedHeader' + ams.devext + '.js');
 															break;
 														case 'keytable':
 															ams.ajax.check(window.KeyTable,
-																		   ams.baseURL + 'ext/jquery-dataTables-keyTable' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-keyTable' + ams.devext + '.js');
 															break;
 														case 'rowgrouping':
 															ams.ajax.check($.fn.rowGrouping,
-																		   ams.baseURL + 'ext/jquery-dataTables-rowGrouping' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-rowGrouping' + ams.devext + '.js');
 															break;
 														case 'rowreordering':
 															ams.ajax.check($.fn.rowReordering,
-																		   ams.baseURL + 'ext/jquery-dataTables-rowReordering' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-rowReordering' + ams.devext + '.js');
 															break;
 														case 'scroller':
 															ams.ajax.check($.fn.dataTable.Scroller,
-																		   ams.baseURL + 'ext/jquery-dataTables-scroller' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/jquery-dataTables-scroller' + ams.devext + '.js');
 															break;
 														default:
 															break;
 													}
 												}
 			 */
 			tablednd: function(element) {
 				var tables = $('.table-dnd', element);
 				if (tables.length > 0) {
 					ams.ajax.check($.fn.tableDnD,
-								   ams.baseURL + 'ext/jquery-tablednd' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-tablednd' + ams.devext + '.js',
 								   function(first_load) {
 										tables.each(function() {
 											var table = $(this);
 											$(table).on('mouseover', 'tr', function() {
 												$(this.cells[0]).addClass('drag-handle');
 														});
 														var local_target = ams.getFunctionByName(target);
 														if (typeof(local_target) == 'function') {
 															local_target.call(table, dnd_table, rows);
 														} else {
-															ams.ajax.post(target, {names: rows});
+															ams.ajax.post(target, {names: JSON.stringify(rows)});
 														}
 													}
+													return false;
 												}
 											};
 											var settings = $.extend({}, data_options, data.amsTabledndOptions);
 											settings = ams.executeFunctionByName(data.amsTabledndInitCallback, table, settings) || settings;
 											var plugin = table.tableDnD(settings);
 								   });
 				}
 			},
 			/**
+			 * TinyMCE plug-in
+			 */
+			tinymce: function(element) {
+				function cleanEditors() {
+					$('.tinymce', $(this)).each(function() {
+						var editor = tinymce.get($(this).attr('id'));
+						if (editor) {
+							editor.remove();
+						}
+					});
+				}
+				var editors = $('.tinymce', element);
+				if (editors.length > 0) {
+					var baseURL = ams.baseURL + 'ext/tinymce' + (ams.devmode ? '/dev' : '');
+					ams.ajax.check(window.tinymce,
+								   baseURL + '/tinymce' + ams.devext + '.js',
+								   function(first_load) {
+										if (first_load) {
+											ams.getScript(baseURL + '/jquery.tinymce' + ams.devext + '.js');
+											tinymce.baseURL = baseURL;
+											tinymce.suffix = ams.devext;
+											ams.skin.registerCleanCallback(cleanEditors);
+										}
+										editors.each(function() {
+											var editor = $(this);
+											var data = editor.data();
+											var data_options = {
+												theme: "modern",
+												language: ams.lang,
+												plugins: [
+													"advlist autosave autolink lists link image charmap print preview hr anchor pagebreak",
+													"searchreplace wordcount visualblocks visualchars code fullscreen",
+													"insertdatetime media nonbreaking save table contextmenu directionality",
+													"emoticons paste textcolor colorpicker textpattern"
+												],
+												toolbar1: "newdocument undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image",
+												toolbar2: "print preview media | forecolor backcolor emoticons | code fullscreen",
+												content_css: data.amsTinymceContentCss,
+												formats: data.amsTinymceFormats,
+												style_formats: data.amsTinymceStyleFormats,
+												block_formats: data.amsTinymceBlockFormats,
+												valid_classes: data.amsTinymceValidClasses,
+												image_advtab: true,
+												image_list: ams.getFunctionByName(data.amsTinymceImageList) || data.amsTinymceImageList,
+												image_class_list: data.amsTinymceImageClassList,
+												link_list: ams.getFunctionByName(data.amsTinymceLinkList) || data.amsTinymceLinkList,
+												link_class_list: data.amsTinymceLinkClassList,
+												resize: true
+											};
+											if (data.amsTinymceExternalPlugins) {
+												var names = data.amsTinymceExternalPlugins.split(/\s+/);
+												for (var index in names) {
+													var plugin_src = editor.data('ams-tinymce-plugin-' + names[index]);
+													tinymce.PluginManager.load(names[index], ams.getSource(plugin_src));
+												}
+											}
+											var settings = $.extend({}, data_options, data.amsTinymceOptions);
+											settings = ams.executeFunctionByName(data.amsTinymceInitCallback, editor, settings) || settings;
+											var plugin = editor.tinymce(settings);
+											ams.executeFunctionByName(data.amsTinymceAfterInitCallback, editor, plugin, settings);
+										});
+								   });
+				}
+			},
+			/**
+			 * Image area select plug-in
+			 */
+			imgareaselect: function(element) {
+				var images = $('.imgareaselect', element);
+				if (images.length > 0) {
+					ams.ajax.check($.fn.imgAreaSelect,
+								   ams.baseURL + 'ext/jquery-imgareaselect-0.9.10' + ams.devext + '.js',
+								   function(first_load) {
+									   if (first_load)
+										   ams.getCSS(ams.baseURL + '../css/ext/jquery-imgareaselect' + ams.devext + '.css');
+									   images.each(function() {
+										   var image = $(this);
+										   var data = image.data();
+										   var parent = data.amsImgareaselectParent ? image.parents(data.amsImgareaselectParent) : 'body';
+										   var data_options = {
+											   instance: true,
+											   handles: true,
+											   parent: parent,
+											   x1: data.amsImgareaselectX1 || 0,
+											   y1: data.amsImgareaselectY1 || 0,
+											   x2: data.amsImgareaselectX2 || data.amsImgareaselectImageWidth,
+											   y2: data.amsImgareaselectY2 || data.amsImgareaselectImageHeight,
+											   imageWidth: data.amsImgareaselectImageWidth,
+											   imageHeight: data.amsImgareaselectImageHeight,
+											   minWidth: 128,
+											   minHeight: 128,
+											   aspectRatio: data.amsImgareaselectRatio,
+											   onSelectEnd: ams.getFunctionByName(data.amsImgareaselectSelectEnd) || function(img, selection) {
+												   var target = data.amsImgareaselectTargetField || 'image_';
+												   $('input[name="' + target + 'x1"]', parent).val(selection.x1);
+												   $('input[name="' + target + 'y1"]', parent).val(selection.y1);
+												   $('input[name="' + target + 'x2"]', parent).val(selection.x2);
+												   $('input[name="' + target + 'y2"]', parent).val(selection.y2);
+											   }
+										   };
+										   var settings = $.extend({}, data_options, data.amsImgareaselectOptions);
+										   settings = ams.executeFunctionByName(data.amsImgareaselectInitCallback, image, settings) || settings;
+										   var plugin = image.imgAreaSelect(settings);
+										   ams.executeFunctionByName(data.amsImgareaselectAfterInitCallback, image, plugin, settings);
+										   // Add update timeout when plug-in is displayed into a modal dialog
+										   setTimeout(function() {
+											   plugin.update();
+										   }, 250);
+									   });
+								   })
+				}
+			},
+			/**
 			 * FancyBox plug-in
 			 */
 			fancybox: function(element) {
 				var fancyboxes = $('.fancybox', element);
 				if (fancyboxes.length > 0) {
 					ams.ajax.check($.fn.fancybox,
-								   ams.baseURL + 'ext/jquery-fancybox-2.1.5' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'ext/jquery-fancybox-2.1.5' + ams.devext + '.js',
 								   function(first_load) {
 										if (first_load)
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-fancybox-2.1.5' + (ams.devmode ? '.css' : '.min.css'));
+											ams.getCSS(ams.baseURL + '../css/ext/jquery-fancybox-2.1.5' + ams.devext + '.css');
 										fancyboxes.each(function() {
 											var fancybox = $(this);
 											var data = fancybox.data();
 											var helpers = (data.amsFancyboxHelpers || '').split(/\s+/);
 											if (helpers.length > 0) {
 												for (var index in helpers) {
 													var helper = helpers[index];
 													switch (helper) {
 														case 'buttons':
 															ams.ajax.check($.fancybox.helpers.buttons,
-																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-buttons.js' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-buttons' + ams.devext + '.js');
 															break;
 														case 'thumbs':
 															ams.ajax.check($.fancybox.helpers.thumbs,
-																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-thumbs.js' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-thumbs' + ams.devext + '.js');
 															break;
 														case 'media':
 															ams.ajax.check($.fancybox.helpers.media,
-																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-media.js' + (ams.devmode ? '.js' : '.min.js'));
+																		   ams.baseURL + 'ext/fancybox-helpers/fancybox-media' + ams.devext + '.js');
 															break;
 														default:
 															break;
 													}
 												}
 								   });
 				}
 			},
 			/**
-			 * Image area select plug-in
-			 */
-			imgareaselect: function(element) {
-				var images = $('.imgareaselect', element);
-				if (images.length > 0) {
-					ams.ajax.check($.fn.imgAreaSelect,
-								   ams.baseURL + 'ext/jquery-imgareaselect-0.9.10' + (ams.devmode ? '.js' : '.min.js'),
-								   function(first_load) {
-										if (first_load)
-											ams.getCSS(ams.baseURL + '../css/ext/jquery-imgareaselect' + (ams.devmode ? '.css' : '.min.css'));
-										images.each(function() {
-											var image = $(this);
-											var data = image.data();
-											var parent = data.amsImgareaselectParent ? image.parents(data.amsImgareaselectParent) : 'body';
-											var data_options = {
-												instance: true,
-												handles: true,
-												parent: parent,
-												x1: data.amsImgareaselectX1 || 0,
-												y1: data.amsImgareaselectY1 || 0,
-												x2: data.amsImgareaselectX2 || data.amsImgareaselectImageWidth,
-												y2: data.amsImgareaselectY2 || data.amsImgareaselectImageHeight,
-												imageWidth: data.amsImgareaselectImageWidth,
-												imageHeight: data.amsImgareaselectImageHeight,
-												minWidth: 128,
-												minHeight: 128,
-												aspectRatio: data.amsImgareaselectRatio,
-												onSelectEnd: ams.getFunctionByName(data.amsImgareaselectSelectEnd) || function(img, selection) {
-													var target = data.amsImgareaselectTargetField || 'image_';
-													$('input[name="' + target + 'x1"]', parent).val(selection.x1);
-													$('input[name="' + target + 'y1"]', parent).val(selection.y1);
-													$('input[name="' + target + 'x2"]', parent).val(selection.x2);
-													$('input[name="' + target + 'y2"]', parent).val(selection.y2);
-												}
-											};
-											var settings = $.extend({}, data_options, data.amsImgareaselectOptions);
-											settings = ams.executeFunctionByName(data.amsImgareaselectInitCallback, image, settings) || settings;
-											var plugin = image.imgAreaSelect(settings);
-											ams.executeFunctionByName(data.amsImgareaselectAfterInitCallback, image, plugin, settings);
-											// Add update timeout when plug-in is displayed into a modal dialog
-											setTimeout(function() {
-												plugin.update();
-											}, 250);
-										});
-								   })
-				}
-			},
-			/**
 			 * Sparkline graphs
 			 */
 			graphs: function(element) {
 				var graphs = $('.sparkline', element);
 				if (graphs.length > 0) {
 					ams.ajax.check(ams.graphs,
-								   ams.baseURL + 'myams-graphs' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'myams-graphs' + ams.devext + '.js',
 								   function() {
 										ams.graphs.init(graphs);
 								   });
 				}
 			},
 				if (scrollbars.length > 0) {
 					ams.ajax.check($.event.special.mousewheel,
 								   ams.baseURL + 'ext/jquery-mousewheel.min.js',
 								   function() {
 										ams.ajax.check($.fn.mCustomScrollbar,
-													   ams.baseURL + 'ext/jquery-mCustomScrollbar' + (ams.devmode ? '.js' : '.min.js'),
+													   ams.baseURL + 'ext/jquery-mCustomScrollbar' + ams.devext + '.js',
 													   function(first_load) {
 															if (first_load)
 																ams.getCSS(ams.baseURL + '../css/ext/jquery-mCustomScrollbar.css',
 																		  'jquery-mCustomScrollbar');
 															scrollbars.each(function() {
 		_initDesktopWidgets: function(element) {
 			if (ams.enable_widgets) {
 				var widgets = $('.ams-widget', element);
 				if (widgets.length > 0)
 					ams.ajax.check($.fn.MyAMSWidget,
-								   ams.baseURL + 'myams-widgets' + (ams.devmode ? '.js' : '.min.js'),
+								   ams.baseURL + 'myams-widgets' + ams.devext + '.js',
 								   function() {
 										widgets.each(function() {
 											var widget = $(this);
 											var data = widget.data();
 											var data_options = {
 		/**
 		 * Big message box
 		 */
 		bigBox: function(options, callback) {
 			ams.ajax.check(ams.notify,
-						   ams.baseURL + 'myams-notify' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'myams-notify' + ams.devext + '.js',
 						   function() {
 								ams.notify.messageBox(options, callback);
 						   });
 		},
 				callback = options;
 				options = status || {};
 				status = 'info';
 			}
 			ams.ajax.check(ams.notify,
-						   ams.baseURL + 'myams-notify' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'myams-notify' + ams.devext + '.js',
 						   function() {
 								switch (status) {
 									case 'error':
 									case 'danger':
 										options.color = '#C46A69';
 				callback = options;
 				options = status || {};
 				status = 'info';
 			}
 			ams.ajax.check(ams.notify,
-						   ams.baseURL + 'myams-notify' + (ams.devmode ? '.js' : '.min.js'),
+						   ams.baseURL + 'myams-notify' + ams.devext + '.js',
 						   function() {
 								switch (status) {
 									case 'error':
 									case 'danger':
 										options.color = '#C46A69';
 				}
 			}
 		},
 		/**
+		 * List of registered 'cleaning' callbacks
+		 * These callbacks are called before loading a new URL into a given container
+		 * to clean required elements from memory before the DOM elements are removed
+		 */
+		_clean_callbacks: [],
+		/**
+		 * Register a callback which should be called before a container is replaced
+		 */
+		registerCleanCallback: function(callback) {
+			var callbacks = ams.skin._clean_callbacks;
+			if (callbacks.indexOf(callback) < 0)
+				callbacks.push(callback);
+		},
+		/**
+		 * Call registered cleaning callbacks on given container
+		 */
+		cleanContainer: function(container) {
+			var callbacks = ams.skin._clean_callbacks;
+			for (var index in callbacks) {
+				callbacks[index].call(container);
+			}
+		},
+		/**
 		 * Load given URL into container
 		 */
 		loadURL: function(url, container, options, callback) {
 			if (url.startsWith('#')) {
 				url = url.substr(1);
 				type: 'GET',
 				url: url,
 				dataType: 'html',
 				cache: false,
 				beforeSend: function() {
-					container.html('<h1><i class="fa fa-cog fa-spin"></i> Loading... </h1>');
+					ams.skin.cleanContainer(container);
+					container.html('<h1 class="loading"><i class="fa fa-cog fa-spin"></i> Loading... </h1>');
 					if (container[0] == $('#content')[0]) {
 						ams.skin._drawBreadCrumb();
 						document.title = $('.breadcrumb LI:last-child').text();
 						$('html, body').animate({scrollTop: 0}, 'fast');
 					} else {
 						ams.executeFunctionByName(callback, this, data, status, request, options);
 					else {
 						var request_data = ams.ajax.getResponse(request);
 						var data_type = request_data.content_type;
 						var result = request_data.data;
+						$('.loading', container).remove();
 						switch (data_type) {
 							case 'json':
 								ams.ajax.handleJSON(result, container);
 								break;
 							case 'script':
 		} else {
 			ams.root.addClass('mobile-detected');
 			ams.device = 'mobile';
 			if (ams.enable_fastclick) {
 				ams.ajax.check($.fn.noClickDelay,
-							   ams.baseURL + '/ext/jquery-smartclick' + (ams.devmode ? '.js' : '.min.js'),
+							   ams.baseURL + '/ext/jquery-smartclick' + ams.devext + '.js',
 							   function() {
 								   $('NAV UL A').noClickDelay();
 								   $('#hide-menu A').noClickDelay();
 							   });
 			}
 				element.popover('hide');
 		});
 		// Resize events
 		ams.ajax.check($.resize,
-					   ams.baseURL + 'ext/jquery-resize' + (ams.devmode ? '.js' : '.min.js'),
+					   ams.baseURL + 'ext/jquery-resize' + ams.devext + '.js',
 					   function() {
 						   $('#main').resize(function() {
 							   ams.skin._setPageHeight();
 							   ams.skin._checkMobileWidth();
 						   });
 						   });
 					   });
 		// Init AJAX navigation
 		if (ams.ajax_nav) {
-			if ($('nav').length > 0)
-				ams.skin.checkURL();
 			$(document).on('click', 'a[href="#"]', function(e) {
 				e.preventDefault();
 			});
 			$(document).on('click', 'a[href!="#"]:not([data-toggle]), [data-ams-url]:not([data-toggle])', function(e) {
 				var link = $(e.currentTarget);
 			if (button.exists() && button.parent().hasClass('input-file')) {
 				button.next('input[type="text"]').val(input.val());
 			}
 		});
+		// Prevent bootstrap dialog from blocking TinyMCE focus
+		$(document).on('focusin', function(e) {
+			if ($(e.target).closest('.mce-window').length) {
+				e.stopImmediatePropagation();
+			}
+		});
 		// Disable clicks on disabled tabs
 		$("a[data-toggle=tab]", ".nav-tabs").on("click", function(e) {
 			if ($(this).parent('li').hasClass("disabled")) {
 				e.preventDefault();
 				return false;
 				if (data.amsTabLoadOnce)
 					link.data('ams-tab-loaded', true);
 			}
 		});
-		// Init plug-ins required by main layout
+		// Init page content
-		ams.plugins.enabled.hint(document);
+		ams.initContent(document);
+		if (ams.ajax_nav && ($('nav').length > 0))
-		// Init content when not loaded by AJAX request
+			ams.skin.checkURL();
-		// or when redirecting to authentication page...
-		if ((window.location.hash == '') || (ams.getQueryVar(window.location.href, 'came_from') != false))
-			ams.initContent(document);
 		// Add unload event listener to check for modified forms
 		$(window).on('beforeunload', ams.form.checkBeforeUnload);
 	};

pyams/pyams_skin