src/pyams_skin/resources/js/myams.js
changeset 121 2c87fbbec680
parent 118 391ad752903e
child 125 d294083fb28c
--- a/src/pyams_skin/resources/js/myams.js	Tue Mar 01 12:28:56 2016 +0100
+++ b/src/pyams_skin/resources/js/myams.js	Tue Mar 01 12:29:20 2016 +0100
@@ -1266,10 +1266,15 @@
 				focused = $('input, select', container).first();
 			}
 			if (focused.exists()) {
+				if (focused.hasClass('select2-input')) {
+					focused = focused.parents('.select2');
+				}
 				if (focused.hasClass('select2')) {
 					setTimeout(function() {
 						focused.select2('focus');
-						focused.select2('open');
+						if (focused.data('ams-focus-open') === true) {
+							focused.select2('open');
+						}
 					}, 100);
 				} else {
 					focused.focus();
@@ -2063,6 +2068,9 @@
 		 * Close modal dialog associated with given context
 		 */
 		close: function(context) {
+			if (typeof(context) === 'string') {
+				context = $(context);
+			}
 			var modal = context.parents('.modal').data('modal');
 			if (modal) {
 				var manager = $('body').data('modalmanager');
@@ -2691,7 +2699,7 @@
 				var sliders = $('.slider', element);
 				if (sliders.length > 0) {
 					ams.ajax.check($.fn.slider,
-								   ams.baseURL + 'ext/bootstrap-slider.min.js',
+								   ams.baseURL + 'ext/bootstrap-slider-2.0.0' + ams.devext + '.js',
 								   function() {
 										sliders.each(function() {
 											var slider = $(this);
@@ -3007,7 +3015,7 @@
 				var masks = $('[data-mask]', element);
 				if (masks.length > 0) {
 					ams.ajax.check($.fn.mask,
-								   ams.baseURL + 'ext/jquery-maskedinput-1.3.1.min.js',
+								   ams.baseURL + 'ext/jquery-maskedinput-1.4.1' + ams.devext + '.js',
 								   function() {
 										masks.each(function() {
 											var mask = $(this);
@@ -3400,7 +3408,7 @@
 																break;
 															case 'editable':
 																var ed_settings = $.extend({}, data.amsDatatableEditableOptions, settings.editable);
-																ed_settings = ams.executeFunctionByName(data.amsDatatableEditableInitCallback, table, ed_settings) || ed_settings;
+														ed_settings = ams.executeFunctionByName(data.amsDatatableEditableInitCallback, table, ed_settings) || ed_settings;
 																table.data('ams-editable', data.amsDatatableEditableConstructor === undefined ?
 																							table.makeEditable(ed_settings)
 																							: ams.executeFunctionByName(data.amsDatatableEditableConstructor, table, plugin, ed_settings));
@@ -3599,7 +3607,7 @@
 				var images = $('.imgareaselect', element);
 				if (images.length > 0) {
 					ams.ajax.check($.fn.imgAreaSelect,
-								   ams.baseURL + 'ext/jquery-imgareaselect-0.9.10' + ams.devext + '.js',
+								   ams.baseURL + 'ext/jquery-imgareaselect-0.9.11-rc1' + ams.devext + '.js',
 								   function(first_load) {
 									   if (first_load) {
 										   ams.getCSS(ams.baseURL + '../css/ext/jquery-imgareaselect' + ams.devext + '.css');
@@ -4645,7 +4653,7 @@
 			$(document).on('click', 'a[href!="#"]:not([data-toggle]), [data-ams-url]:not([data-toggle])', function(e) {
 				var link = $(e.currentTarget);
 				var handlers = link.data('ams-disabled-handlers');
-				if ((handlers == true) || (handlers == 'click')) {
+				if ((handlers === true) || (handlers === 'click') || (handlers === 'all')) {
 					return;
 				}
 				var href = link.attr('href') || link.data('ams-url');
@@ -4710,7 +4718,7 @@
 				   .on('click', '[data-toggle="modal"]', function(e) {
 			var source = $(this);
 			var handlers = source.data('ams-disabled-handlers');
-			if ((handlers == true) || (handlers == 'click')) {
+			if ((handlers === true) || (handlers === 'click') || (handlers === 'all')) {
 				return;
 			}
 			if (source.data('ams-context-menu') === true) {
@@ -4736,7 +4744,7 @@
 		$(document).on('click', '[data-ams-click-handler]', function(e) {
 			var source = $(this);
 			var handlers = source.data('ams-disabled-handlers');
-			if ((handlers == true) || (handlers == 'click')) {
+			if ((handlers === true) || (handlers === 'click') || (handlers === 'all')) {
 				return;
 			}
 			var data = source.data();
@@ -4758,7 +4766,7 @@
 		$(document).on('change', '[data-ams-change-handler]', function(e) {
 			var source = $(this);
 			var handlers = source.data('ams-disabled-handlers');
-			if ((handlers == true) || (handlers == 'change')) {
+			if ((handlers === true) || (handlers === 'change') || (handlers === 'all')) {
 				return;
 			}
 			var data = source.data();