diff --git a/assets/js/um-modal.js b/assets/js/um-modal.js index ee6485fb..95046d0c 100644 --- a/assets/js/um-modal.js +++ b/assets/js/um-modal.js @@ -16,25 +16,25 @@ jQuery(document).ready(function() { jQuery(document).on('click', '.um-modal .um-single-file-preview a.cancel', function(e){ e.preventDefault(); - + var parent = jQuery(this).parents('.um-modal-body'); var src = jQuery(this).parents('.um-modal-body').find('.um-single-fileinfo a').attr('href'); - - parent.find('.um-single-file-preview').hide(); - - parent.find('.ajax-upload-dragdrop').show(); - - parent.find('.um-modal-btn.um-finish-upload').addClass('disabled'); - - um_modal_responsive(); - + var mode = parent.find('.um-single-file-upload').data('set_mode'); + jQuery.ajax({ url: wp.ajax.settings.url, type: 'post', data: { action: 'um_remove_file', src: src, + mode: mode, nonce: um_scripts.nonce + }, + success: function() { + parent.find('.um-single-file-preview').hide(); + parent.find('.ajax-upload-dragdrop').show(); + parent.find('.um-modal-btn.um-finish-upload').addClass('disabled'); + um_modal_responsive(); } }); @@ -46,18 +46,7 @@ jQuery(document).ready(function() { var parent = jQuery(this).parents('.um-modal-body'); var src = jQuery(this).parents('.um-modal-body').find('.um-single-image-preview img').attr('src'); - - jQuery('img.cropper-hidden').cropper('destroy'); - - parent.find('.um-single-image-preview img').attr('src', ''); - - parent.find('.um-single-image-preview').hide(); - - parent.find('.ajax-upload-dragdrop').show(); - - parent.find('.um-modal-btn.um-finish-upload').addClass('disabled'); - - um_modal_responsive(); + var mode = parent.find('.um-single-image-upload').data('set_mode'); jQuery.ajax({ url: wp.ajax.settings.url, @@ -65,7 +54,17 @@ jQuery(document).ready(function() { data: { action: 'um_remove_file', src: src, + mode: mode, nonce: um_scripts.nonce + }, + success: function() { + jQuery('img.cropper-hidden').cropper( 'destroy' ); + parent.find('.um-single-image-preview img').attr( 'src', '' ); + parent.find('.um-single-image-preview').hide(); + parent.find('.ajax-upload-dragdrop').show(); + parent.find('.um-modal-btn.um-finish-upload').addClass( 'disabled' ); + + um_modal_responsive(); } }); diff --git a/assets/js/um-modal.min.js b/assets/js/um-modal.min.js index bab9d48e..b7791d08 100644 --- a/assets/js/um-modal.min.js +++ b/assets/js/um-modal.min.js @@ -1 +1 @@ -jQuery(document).ready(function(){jQuery(document).on("click",".um-popup-overlay",function(){remove_Modal()}),jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()}),jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a',function(e){return e.preventDefault(),!1}),jQuery(document).on("click",".um-modal .um-single-file-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-fileinfo a").attr("href");return a.find(".um-single-file-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um-modal .um-single-image-preview a.cancel",function(e){e.preventDefault();var a=jQuery(this).parents(".um-modal-body"),t=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview img").attr("src");return jQuery("img.cropper-hidden").cropper("destroy"),a.find(".um-single-image-preview img").attr("src",""),a.find(".um-single-image-preview").hide(),a.find(".ajax-upload-dragdrop").show(),a.find(".um-modal-btn.um-finish-upload").addClass("disabled"),um_modal_responsive(),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:t,nonce:um_scripts.nonce}}),!1}),jQuery(document).on("click",".um-finish-upload.file:not(.disabled)",function(){var e=jQuery(this).attr("data-key"),a=jQuery(this).parents(".um-modal-body").find(".um-single-file-preview").html();um_remove_modal(),jQuery(".um-single-file-preview[data-key="+e+"]").fadeIn().html(a);var t=jQuery(".um-field[data-key="+e+"]").find(".um-single-fileinfo a").data("file");jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find(".um-btn-auto-width").html(jQuery(this).attr("data-change")),jQuery(".um-single-file-preview[data-key="+e+"]").parents(".um-field").find('input[type="hidden"]').val(t)}),jQuery(document).on("click",".um-finish-upload.image:not(.disabled)",function(){var a=jQuery(this),t=jQuery(this).attr("data-key"),e=jQuery(this).parents(".um-modal-body").find(".um-single-image-preview"),i=e.find("img").attr("src"),r=e.attr("data-coord"),u=e.find("img").data("file"),n=0;jQuery(this).parents("#um_upload_single").data("user_id")&&(n=jQuery(this).parents("#um_upload_single").data("user_id")),r?(jQuery(this).html(jQuery(this).attr("data-processing")).addClass("disabled"),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",dataType:"json",data:{action:"um_resize_image",src:i,coord:r,user_id:n,key:t,nonce:um_scripts.nonce},success:function(e){e.success&&(d=new Date,"profile_photo"===t?jQuery(".um-profile-photo-img img").attr("src",e.data.image.source_url+"?"+d.getTime()):"cover_photo"===t&&(jQuery(".um-cover-e").empty().html(''),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0'),jQuery(".um").hasClass("um-editing")&&jQuery(".um-cover-overlay").show()),jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",e.data.image.source_url+"?"+d.getTime()),um_remove_modal(),jQuery("img.cropper-invisible").remove(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find('input[type="hidden"]').val(e.data.image.filename))}})):(d=new Date,jQuery(".um-single-image-preview[data-key="+t+"]").fadeIn().find("img").attr("src",i+"?"+d.getTime()),um_remove_modal(),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find(".um-btn-auto-width").html(a.attr("data-change")),jQuery(".um-single-image-preview[data-key="+t+"]").parents(".um-field").find("input[type=hidden]").val(u))}),jQuery(document.body).on("click",'a[data-modal^="um_"], span[data-modal^="um_"]',function(e){var a=jQuery(this).attr("data-modal"),t="normal";if(jQuery(this).data("modal-size"))t=jQuery(this).data("modal-size");jQuery(this).data("modal-copy")&&(jQuery("#"+a).html(jQuery(this).parents(".um-field").find(".um-modal-hidden-content").html()),jQuery(this).parents(".um-profile-photo").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-profile-photo").attr("data-user_id")),jQuery(this).parents(".um-cover").attr("data-ratio")&&jQuery("#"+a).attr("data-ratio",jQuery(this).parents(".um-cover").attr("data-ratio")),jQuery(this).parents(".um-cover").attr("data-user_id")&&jQuery("#"+a).attr("data-user_id",jQuery(this).parents(".um-cover").attr("data-user_id")),0get_atts( $key, $classes, $conditional, $data ) . '>'; + $output .= '
get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">'; if ( in_array( $key, array( 'profile_photo', 'cover_photo' ) ) ) { $field_value = ''; } else { @@ -2573,25 +2573,27 @@ if ( ! class_exists( 'um\core\Fields' ) ) { /* Single File Upload */ case 'file': - $output .= '
get_atts( $key, $classes, $conditional, $data ) . '>'; + $output .= '
get_atts( $key, $classes, $conditional, $data ) . ' data-mode="' . esc_attr( $this->set_mode ) . '" data-upload-label="' . ( ! empty( $data['button_text'] ) ? esc_attr( $data['button_text'] ) : esc_attr__( 'Upload', 'ultimate-member' ) ) . '">'; $output .= ''; - if (isset( $data['label'] )) { + if ( isset( $data['label'] ) ) { $output .= $this->field_label( $label, $key, $data ); } $modal_label = ( isset( $data['label'] ) ) ? $data['label'] : __( 'Upload File', 'ultimate-member' ); $output .= '
'; - if ( $this->field_value( $key, $default, $data ) ) { - $file_field_value = $this->field_value( $key, $default, $data ); + + $file_field_value = $this->field_value( $key, $default, $data ); + + if ( ! empty( $file_field_value ) && 'empty_file' !== $file_field_value ) { $file_type = wp_check_filetype( $file_field_value ); - if ( isset( $this->set_mode ) && 'register' == $this->set_mode ) { - $file_info = get_transient("um_{$file_field_value}"); + if ( um_is_temp_file( $file_field_value ) ) { + $file_info = get_transient( "um_{$file_field_value}" ); } else { - $file_info = um_user( $data['metakey']."_metadata" ); + $file_info = um_user( $data['metakey'] . "_metadata" ); } $file_field_name = $file_field_value; - if( isset( $file_info['original_name'] ) && ! empty( $file_info['original_name'] ) ){ + if ( ! empty( $file_info['original_name'] ) ) { $file_field_name = $file_info['original_name']; } @@ -2631,7 +2633,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { $output .= '
'; $output .= '
' . $modal_label . '
'; $output .= '
'; - if (isset( $this->set_id )) { + if ( isset( $this->set_id ) ) { $set_id = $this->set_id; $set_mode = $this->set_mode; } else { @@ -2651,7 +2653,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) { $output .= '
' . $button_text . '
'; $output .= '