diff -r a2ac7c3363ae -r 6c271ae9cfd3 src/ztfy/myams/resources/js/myams.js --- a/src/ztfy/myams/resources/js/myams.js Tue Mar 01 12:21:09 2016 +0100 +++ b/src/ztfy/myams/resources/js/myams.js Tue Mar 01 12:21:35 2016 +0100 @@ -2063,6 +2063,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 +2694,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); @@ -3528,7 +3531,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'); @@ -4530,7 +4533,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'); @@ -4595,7 +4598,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) { @@ -4621,7 +4624,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(); @@ -4643,7 +4646,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();