diff --git a/assets/js/um-functions.js b/assets/js/um-functions.js
index 4f4ff61e..aee50de5 100644
--- a/assets/js/um-functions.js
+++ b/assets/js/um-functions.js
@@ -591,74 +591,62 @@ function initCrop_UM() {
}
-function um_new_modal( id, size, isPhoto, source ){
-
- var modal = jQuery('body').find('.um-modal-overlay');
-
- if ( modal.length == 0 ) {
+function um_new_modal( id, size, isPhoto, source ) {
+ var modalOverlay = jQuery('.um-modal-overlay');
+ if ( modalOverlay.length !== 0 ) {
+ modalOverlay.hide();
+ modalOverlay.next('.um-modal').hide();
+ }
jQuery('.tipsy').hide();
UM.dropdown.hideAll();
- jQuery('body,html,textarea').css("overflow", "hidden");
+ jQuery( 'body,html,textarea' ).css( 'overflow', 'hidden' );
- jQuery(document).bind("touchmove", function(e){e.preventDefault();});
- jQuery('.um-modal').on('touchmove', function(e){e.stopPropagation();});
+ jQuery( document ).bind( "touchmove", function(e){e.preventDefault();});
+ jQuery( '.um-modal' ).on('touchmove', function(e){e.stopPropagation();});
+
+ var $tpl = jQuery( '
' );
+ var $modal = $tpl.filter('.um-modal');
+ $modal.append( jQuery( '#' + id ) );
+
+ jQuery('body').append( $tpl );
if ( isPhoto ) {
- jQuery('body').append('');
- } else {
- jQuery('body').append('');
- }
+ var photo_ = jQuery('
'),
+ photo_maxw = jQuery(window).width() - 60,
+ photo_maxh = jQuery(window).height() - jQuery(window).height() * 0.25;
- jQuery('#' + id).prependTo('.um-modal');
-
- if ( isPhoto ) {
-
- jQuery('.um-modal').find('.um-modal-photo').html('
');
-
- var photo_ = jQuery('.um-modal-photo img');
- var photo_maxw = jQuery(window).width() - 60;
- var photo_maxh = jQuery(window).height() - ( jQuery(window).height() * 0.25 );
-
- photo_.attr("src", source);
photo_.on( 'load', function() {
+ $modal.find('.um-modal-photo').html( photo_ );
- jQuery('#' + id).show();
- jQuery('.um-modal').show();
-
- photo_.css({'opacity': 0});
- photo_.css({'max-width': photo_maxw });
- photo_.css({'max-height': photo_maxh });
-
- jQuery('.um-modal').css({
+ $modal.addClass('is-photo').css({
'width': photo_.width(),
'margin-left': '-' + photo_.width() / 2 + 'px'
- });
+ }).show().children().show();
- photo_.animate({'opacity' : 1}, 1000);
+ photo_.css({
+ 'opacity': 0,
+ 'max-width': photo_maxw,
+ 'max-height': photo_maxh
+ }).animate({'opacity' : 1}, 1000);
um_modal_responsive();
-
});
-
} else {
- jQuery('#' + id).show();
- jQuery('.um-modal').show();
+ $modal.addClass('no-photo').show().children().show();
um_modal_size( size );
- initImageUpload_UM( jQuery('.um-modal:visible').find('.um-single-image-upload') );
- initFileUpload_UM( jQuery('.um-modal:visible').find('.um-single-file-upload') );
+ initImageUpload_UM( jQuery('.um-modal:visible .um-single-image-upload') );
+ initFileUpload_UM( jQuery('.um-modal:visible .um-single-file-upload') );
um_modal_responsive();
}
- }
-
}
function um_modal_responsive() {
@@ -671,8 +659,8 @@ function um_modal_responsive() {
|| document.documentElement.clientHeight
|| document.body.clientHeight;
- var modal = jQuery('.um-modal:visible');
- var photo_modal = jQuery('.um-modal-body.photo:visible');
+ var modal = jQuery('.um-modal:visible').not('.um-modal-hidden');
+ var photo_modal = modal.find('.um-modal-body.photo:visible');
if ( photo_modal.length ) {
@@ -687,7 +675,7 @@ function um_modal_responsive() {
photo_.css({'max-width': photo_maxw });
photo_.css({'max-height': photo_maxh });
- jQuery('.um-modal').css({
+ modal.css({
'width': photo_.width(),
'margin-left': '-' + photo_.width() / 2 + 'px'
});
@@ -745,21 +733,25 @@ function um_remove_modal() {
jQuery(document).unbind('touchmove');
- jQuery('.um-modal div[id^="um_"]').hide().appendTo('body');
- jQuery('.um-modal,.um-modal-overlay').remove();
+ jQuery('body > .um-modal div[id^="um_"]').hide().appendTo('body');
+ jQuery('body > .um-modal, body > .um-modal-overlay').remove();
}
function um_modal_size( aclass ) {
-
- jQuery('.um-modal:visible').addClass(aclass);
-
+ jQuery('.um-modal:visible').not('.um-modal-hidden').addClass( aclass );
}
+/**
+ * Maybe deprecated
+ *
+ * @deprecated since 2.1.16
+ *
+ * @param id
+ * @param value
+ */
function um_modal_add_attr( id, value ) {
-
- jQuery('.um-modal:visible').data( id, value );
-
+ jQuery('.um-modal:visible').not('.um-modal-hidden').data( id, value );
}
function prepare_Modal() {
diff --git a/assets/js/um-functions.min.js b/assets/js/um-functions.min.js
index d29a74e3..197bfe73 100644
--- a/assets/js/um-functions.min.js
+++ b/assets/js/um-functions.min.js
@@ -1 +1 @@
-function UM_hide_menus(){UM.dropdown.hideAll()}function UM_domenus(){jQuery(".um-dropdown").each(function(e,t){UM.dropdown.setPosition(t)})}function UM_check_password_matched(){jQuery(document).on("keyup","input[data-key=user_password],input[data-key=confirm_user_password]",function(e){var t=jQuery("input[data-key=user_password]").val(),a=jQuery("input[data-key=confirm_user_password]").val(),o=jQuery("input[data-key=user_password],input[data-key=confirm_user_password]");t||a?t!==a?o.removeClass("um-validate-matched").addClass("um-validate-not-matched"):o.removeClass("um-validate-not-matched").addClass("um-validate-matched"):o.removeClass("um-validate-matched").removeClass("um-validate-not-matched")})}function um_responsive(){jQuery(".um").each(function(){element_width=jQuery(this).width(),element_width<=340?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob340")):element_width<=500?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob500")):element_width<=800?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob800")):element_width<=960?(jQuery(this).removeClass("uimob340"),jQuery(this).removeClass("uimob500"),jQuery(this).removeClass("uimob800"),jQuery(this).removeClass("uimob960"),jQuery(this).addClass("uimob960")):960'+r.data("upload_help_text")+"":upload_help_text="",r.data("icon")?icon='':icon="",r.data("upload_text")?upload_text=''+r.data("upload_text")+"":upload_text="";var e=0;jQuery("#um_upload_single:visible").data("user_id")&&(e=jQuery("#um_upload_single:visible").data("user_id")),r.uploadFile({url:wp.ajax.settings.url,method:"POST",multiple:!1,formData:{action:"um_imageupload",key:r.data("key"),set_id:r.data("set_id"),set_mode:r.data("set_mode"),_wpnonce:r.data("nonce"),timestamp:r.data("timestamp"),user_id:e},fileName:r.data("key"),allowedTypes:r.data("allowed_types"),maxFileSize:r.data("max_size"),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:r.data("max_size_error"),extErrorStr:r.data("extension_error"),maxFileCountErrorStr:r.data("max_files_error"),maxFileCount:1,showDelete:!1,showAbort:!1,showDone:!1,showFileCounter:!1,showStatusAfterSuccess:!0,returnType:"json",onSubmit:function(e){r.parents(".um-modal-body").find(".um-error-block").remove()},onSuccess:function(e,t,a){r.selectedFiles=0,t.success&&0==t.success||void 0!==t.data.error?(r.parents(".um-modal-body").append(''+t.data.error+"
"),r.parents(".um-modal-body").find(".upload-statusbar").hide(0),um_modal_responsive()):jQuery.each(t.data,function(e,t){var a=r.parents(".um-modal-body").find(".um-single-image-preview img"),o=r.parents(".um-modal-body").find(".um-single-image-preview"),i=new Date;a.attr("src",t.url+"?"+i.getTime()),a.data("file",t.file),a.on("load",function(){r.parents(".um-modal-body").find(".um-modal-btn.um-finish-upload.disabled").removeClass("disabled"),r.parents(".um-modal-body").find(".ajax-upload-dragdrop,.upload-statusbar").hide(0),o.show(0),um_modal_responsive()})})},onError:function(e){console.log(e)}})}function initFileUpload_UM(o){o.data("upload_help_text")?upload_help_text=''+o.data("upload_help_text")+"":upload_help_text="",o.data("icon")?icon='':icon="",o.data("upload_text")?upload_text=''+o.data("upload_text")+"":upload_text="",jQuery("#um_upload_single:visible").data("user_id")&&(user_id=jQuery("#um_upload_single:visible").data("user_id")),o.uploadFile({url:wp.ajax.settings.url,method:"POST",multiple:!1,formData:{action:"um_fileupload",key:o.data("key"),set_id:o.data("set_id"),user_id:o.data("user_id"),set_mode:o.data("set_mode"),_wpnonce:o.data("nonce"),timestamp:o.data("timestamp")},fileName:o.data("key"),allowedTypes:o.data("allowed_types"),maxFileSize:o.data("max_size"),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:o.data("max_size_error"),extErrorStr:o.data("extension_error"),maxFileCountErrorStr:o.data("max_files_error"),maxFileCount:1,showDelete:!1,showAbort:!1,showDone:!1,showFileCounter:!1,showStatusAfterSuccess:!0,onSubmit:function(e){o.parents(".um-modal-body").find(".um-error-block").remove()},onSuccess:function(e,t,a){o.selectedFiles=0,t.success&&0==t.success||void 0!==t.data.error?(o.parents(".um-modal-body").append(''+t.data.error+"
"),o.parents(".um-modal-body").find(".upload-statusbar").hide(0)):jQuery.each(t.data,function(e,t){o.parents(".um-modal-body").find(".um-modal-btn.um-finish-upload.disabled").removeClass("disabled"),o.parents(".um-modal-body").find(".ajax-upload-dragdrop,.upload-statusbar").hide(0),o.parents(".um-modal-body").find(".um-single-file-preview").show(0),"icon"==e?o.parents(".um-modal-body").find(".um-single-fileinfo i").removeClass().addClass(t):"icon_bg"==e?o.parents(".um-modal-body").find(".um-single-fileinfo span.icon").css({"background-color":t}):"filename"==e?o.parents(".um-modal-body").find(".um-single-fileinfo a").attr("data-file",t):"original_name"==e?(o.parents(".um-modal-body").find(".um-single-fileinfo a").attr("data-orignal-name",t),o.parents(".um-modal-body").find(".um-single-fileinfo span.filename").html(t)):"url"==e&&o.parents(".um-modal-body").find(".um-single-fileinfo a").attr("href",t)}),setTimeout(function(){um_modal_responsive()},1e3)},onError:function(e){console.log(e)}})}function initCrop_UM(){var t=jQuery(".um-modal .um-single-image-preview img").first(),e=jQuery(".um-modal .um-single-image-preview"),a=t.parent().attr("data-crop"),o=t.parent().attr("data-min_width"),i=t.parent().attr("data-min_height"),r=t.parent().attr("data-ratio");if(jQuery(".um-modal").find("#um_upload_single").attr("data-ratio"))r=(r=jQuery(".um-modal").find("#um_upload_single").attr("data-ratio")).split(":")[0];if(t.length&&""!=t.attr("src")){var d=jQuery(window).height()-(jQuery(".um-modal-footer a").height()+20)-50-jQuery(".um-modal-header:visible").height();if(t.css({height:"auto"}),e.css({height:"auto"}),jQuery(window).height()<=400?(e.css({height:d+"px","max-height":d+"px"}),t.css({height:"auto"})):(t.css({height:"auto","max-height":d+"px"}),e.css({height:t.height(),"max-height":d+"px"})),"square"==a)var u={minWidth:o,minHeight:i,dragCrop:!1,aspectRatio:1,zoomable:!1,rotatable:!1,dashed:!1,done:function(e){t.parent().attr("data-coord",Math.round(e.x)+","+Math.round(e.y)+","+Math.round(e.width)+","+Math.round(e.height))}};else if("cover"==a){0'))}}function um_new_modal(e,t,a,o){if(0==jQuery("body").find(".um-modal-overlay").length)if(jQuery(".tipsy").hide(),UM.dropdown.hideAll(),jQuery("body,html,textarea").css("overflow","hidden"),jQuery(document).bind("touchmove",function(e){e.preventDefault()}),jQuery(".um-modal").on("touchmove",function(e){e.stopPropagation()}),a?jQuery("body").append(''):jQuery("body").append(''),jQuery("#"+e).prependTo(".um-modal"),a){jQuery(".um-modal").find(".um-modal-photo").html("
");var i=jQuery(".um-modal-photo img"),r=jQuery(window).width()-60,d=jQuery(window).height()-.25*jQuery(window).height();i.attr("src",o),i.on("load",function(){jQuery("#"+e).show(),jQuery(".um-modal").show(),i.css({opacity:0}),i.css({"max-width":r}),i.css({"max-height":d}),jQuery(".um-modal").css({width:i.width(),"margin-left":"-"+i.width()/2+"px"}),i.animate({opacity:1},1e3),um_modal_responsive()})}else jQuery("#"+e).show(),jQuery(".um-modal").show(),um_modal_size(t),initImageUpload_UM(jQuery(".um-modal:visible").find(".um-single-image-upload")),initFileUpload_UM(jQuery(".um-modal:visible").find(".um-single-file-upload")),um_modal_responsive()}function um_modal_responsive(){var e=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth,t=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight,a=jQuery(".um-modal:visible");if(jQuery(".um-modal-body.photo:visible").length){a.removeClass("uimob340"),a.removeClass("uimob500");var o=jQuery(".um-modal-photo img"),i=e-60,r=t-.25*t;o.css({opacity:0}),o.css({"max-width":i}),o.css({"max-height":r}),jQuery(".um-modal").css({width:o.width(),"margin-left":"-"+o.width()/2+"px"}),o.animate({opacity:1},1e3);var d=(t-a.innerHeight())/2+"px";a.animate({bottom:d},300)}else if(a.length)if(a.removeClass("uimob340"),a.removeClass("uimob500"),e<=340)a.addClass("uimob340"),initCrop_UM(),a.animate({bottom:0},300);else if(e<=500)a.addClass("uimob500"),initCrop_UM(),a.animate({bottom:0},300);else if(e<=800){initCrop_UM();d=(t-a.innerHeight())/2+"px";a.animate({bottom:d},300)}else if(e<=960){initCrop_UM();d=(t-a.innerHeight())/2+"px";a.animate({bottom:d},300)}else if(960