").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith(''),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),jQuery("#"+e))).html(i),jQuery("body").on("click",".wp-switch-editor",function(){var i=jQuery(this);i.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(i=i.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(e,i))})}}},wp.hooks.addAction("um_admin_modal_success_result","um_admin_builder",function(i,e){UM.admin.builder.fieldConditions.refresh(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0'+jQuery(".um-col-demon-row").html()+"
"),i.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+i.find(".um-admin-drag-row").length),i.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+i.find(".um-admin-drag-row").length),UM_update_rows(),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'*[data-row_action="add_subrow"]',function(){jQuery(this).parents(".um-admin-drag-row").find(".um-admin-drag-rowsubs").append(''+jQuery(".um-col-demon-subrow").html()+"
"),UM_update_subrows(),UM_Rows_Refresh()}),jQuery(document.body).on("click",'a[data-remove_element^="um-"]',function(){let i=jQuery(this),e=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+e).children(".um-admin-row-loading");var a=jQuery(this).parents(".um-admin-drag-row").index(),n=jQuery(this).parents(".um-admin-drag-rowsub").index();let r={row:a,subrow:n},o=!1;jQuery.each(UM.admin.builder.deleteProcess,function(i){if(r.row===UM.admin.builder.deleteProcess[i].row&&r.subrow===UM.admin.builder.deleteProcess[i].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+e).find(".um-admin-drag-fld").toArray(),0").append(e.siblings(".um-hidden-multi-selects").clone()).html()+''+wp.i18n.__("Remove","ultimate-member")+"",e.append(i),e.find("li:last .um-hidden-multi-selects").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-selects").attr("id",e.data("id_attr")+"-"+t))});var t,e=-(new Date).getTimezoneOffset()/60,i=(jQuery('input[name="um-gmt-offset"]').val(e),jQuery(".um-admin-metabox").find(".um-slider").each(function(){var e=jQuery(this),a=parseInt(e.data("min")),t=parseInt(e.data("max")),a=[a=void 0!==jQuery("#"+e.data("field_name")+"_min").val()?jQuery("#"+e.data("field_name")+"_min").val():a,t=void 0!==jQuery("#"+e.data("field_name")+"_max").val()?jQuery("#"+e.data("field_name")+"_max").val():t];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),jQuery(".um-admin-metabox").find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}}).pickadate("picker").set("select",1e3*e.data("value"))}),jQuery(".um-admin-metabox").find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),!1);function s(e,a){var t,i="",s=e.siblings(".um-slider-range").data("placeholder-s"),l=e.siblings(".um-slider-range").data("placeholder-p"),a=a?(i=(a.values[0]===a.values[1]?s.replace("{value}",a.values[0]):l.replace("{min_range}",a.values[0]).replace("{max_range}",a.values[1])).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=a.values[0],a.values[1]):(i=(e.slider("values",0)===e.slider("values",1)?s.replace("{value}",e.slider("values",0)):l.replace("{min_range}",e.slider("values",0)).replace("{max_range}",e.slider("values",1))).replace("{field_label}",e.siblings(".um-slider-range").data("label")),t=e.slider("values",0),e.slider("values",1));e.siblings(".um-slider-range").html(i),e.siblings(".um_range_min").val(t),e.siblings(".um_range_max").val(a)}function a(){jQuery(".um-forms-line").removeClass("um-forms-line-conditioned").each(function(){void 0===jQuery(this).data("conditional")||jQuery(this).hasClass("um-forms-line-conditioned")||(!function i(e){e.addClass("um-forms-line-conditioned");var a=e.data("conditional");var t=a[1];var s=a[2];var l=e.data("prefix");var n=!0;{var r,u;"="===t||"!="===t?-1===a[0].indexOf("||")&&void 0!==(u=jQuery("#"+l+"_"+a[0])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line"))):"~"===t?(m=a[0].split("|"),r=[],jQuery.each(m,function(e){r.push(jQuery("#"+l+"_"+m[e]))}),void 0!==r[0].parents(".um-forms-line").data("conditional")&&(n=i(r[0].parents(".um-forms-line")))):"><"===t&&void 0!==(u=jQuery("#"+l+"_"+a[0]+"_"+a[2])).parents(".um-forms-line").data("conditional")&&(n=i(u.parents(".um-forms-line")))}var d=!1;{var m,o,c,p,f,_,h,g;if("="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?e.is(":checked"):!e.is(":checked"):Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s):"select"===t&&(d=Array.isArray(s)?-1!==s.indexOf(e.val()):e.val()==s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?u.is(":checked"):!u.is(":checked"):Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s):"select"==h&&(d=Array.isArray(s)?-1!==s.indexOf(u.val()):u.val()==s),d&&n);if("!="===t)return-1!==a[0].indexOf("||")?(m=a[0].split("||"),o=!1,jQuery.each(m,function(e){var a,e=jQuery("#"+l+"_"+m[e]),t=(n=!(d=!1),void 0!==e.parents(".um-forms-line").data("conditional")&&(n=i(e.parents(".um-forms-line"))),e.prop("tagName").toLowerCase());"input"===t?(a=e.attr("type"),d="checkbox"===a?"1"==s?!e.is(":checked"):e.is(":checked"):e.val()!=s):"select"===t&&(d=e.val()!=s),d&&n&&(o=!0)}),o):("input"==(h=u.prop("tagName").toLowerCase())?(g=u.attr("type"),d="checkbox"==g?"1"==s?!u.is(":checked"):u.is(":checked"):u.val()!=s):"select"==h&&(d=u.val()!=s),d&&n);if("~"===t)return p=[],"sortable_items"===e.data("field_type")?(c=e.find(".um-sortable-items-value").data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.siblings(".um-sortable-items-field").find("li").addClass("um-hidden-item"),jQuery.each(p,function(e){f.siblings(".um-sortable-items-field").find('li[data-tab-id="'+p[e]+'"]').removeClass("um-hidden-item")}),_=[],f.siblings(".um-sortable-items-field").find("li").each(function(){jQuery(this).hasClass("um-hidden-item")||_.push(jQuery(this).data("tab-id"))}),f.val(_.join(",")),f.siblings(".um-sortable-items-field").sortable("refresh"),d=!0):f.val(null)):(c=e.find(e.data("field_type")).data("field_id"),jQuery.each(r,function(e){var e=r[e],a=e.prop("tagName").toLowerCase();"input"===a?"checkbox"===e.attr("type")&&"1"==s&&e.is(":checked")&&p.push(e.data("fill_"+c)):"select"==a&&!s&&e.val()&&(p=(p=p.concat(e.val())).filter(y))}),f=jQuery('[data-field_id="'+c+'"]'),p.length?(f.find("option").hide(),jQuery.each(p,function(e){f.find('option[value="'+p[e]+'"]').show()}),-1===p.indexOf(f.val())&&(f.val(p[0]),f.find("option").attr("selected",!1).prop("selected",!1),f.find('option[value="'+p[0]+'"]').attr("selected",!0).prop("selected",!0)),d=!0):(f.val(null),f.find("option").attr("selected",!1).prop("selected",!1))),d&&n;if("><"===t)return h=u.prop("tagName").toLowerCase(),(d="input"==h&&"checkbox"==(g=u.attr("type"))?u.is(":checked"):d)&&n}return!1}(jQuery(this))?jQuery(this).hide():(jQuery(this).show(),um_admin_init_users_select()))})}function y(e,a,t){return t.indexOf(e)===a}jQuery(document.body).on("change",".um-md-default-filters-option-line .um-field-wrapper select",function(){var t,e,a;i||(e=(t=jQuery(this)).val(),a=t.data("member_directory"),i=!0,wp.ajax.send("um_member_directory_default_filter_settings",{data:{key:e,directory_id:a,nonce:um_admin_scripts.nonce},success:function(e){var a=t.parents(".um-md-default-filters-option-line").find(".um-field-wrapper2");a.html(e.field_html),i=!1,a.find(".um-slider").each(function(){var e=jQuery(this),a=[parseInt(e.data("min")),parseInt(e.data("max"))];e.slider({range:!0,min:parseInt(e.data("min")),max:parseInt(e.data("max")),values:a,create:function(e,a){},step:1,slide:function(e,a){s(jQuery(this),a)},stop:function(e,a){}}),s(e)}),a.find(".um-datepicker-filter").each(function(){var e=jQuery(this),a=new Date(1e3*e.data("date_min")),t=new Date(1e3*e.data("date_max"));e.pickadate({selectYears:!0,min:a,max:t,formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})}),a.find(".um-timepicker-filter").each(function(){var e=jQuery(this),a=e.data("min"),t=e.data("max"),a=a.split(":"),t=t.split(":");e.pickatime({format:e.data("format"),interval:parseInt(e.data("intervals")),min:[a[0],a[1]],max:[t[0],t[1]],formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()},onSet:function(e){}})})},error:function(e){return!1}}))}),jQuery(".um-md-default-filters-add-option").on("click",function(){var e,a,t;i||((e=jQuery(this).siblings("ul.um-md-default-filters-list")).data("field_id"),(a=0)").append(e.siblings(".um-hidden-md-default-filters").clone()).html(),e.append(''+t+''+wp.i18n.__("Remove","ultimate-member")+' '),e.find("li:last .um-hidden-md-default-filters").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-md-default-filters").attr("id",e.data("id_attr")+"-"+a),e.find("li:last .um-field-wrapper select").trigger("change"))}),jQuery(document.body).on("click",".um-text-delete",function(){jQuery(this).parents("li.um-multi-text-option-line").remove()}),jQuery(".um-multi-text-add-option").on("click",function(){var e=jQuery(this).siblings("ul.um-multi-text-list"),a=0,t=(0").append(e.siblings(".um-hidden-multi-text").clone()).html()),i=e.data("item_class");e.append(''+t+''+wp.i18n.__("Remove","ultimate-member")+" "),e.find("li:last .um-hidden-multi-text").attr("name",jQuery(this).data("name")).addClass("um-forms-field um-long-field").removeClass("um-hidden-multi-text").attr("id",e.data("id_attr")+"-"+a)}),jQuery(".um-media-upload").each(function(){var e=jQuery(this).find(".um-forms-field"),a=e.data("default");""!=e.val()&&e.val()!=a?(e.siblings(".um-set-image").hide(),e.siblings(".um-clear-image").show(),e.siblings(".icon_preview").show()):(e.val()==a&&e.siblings(".icon_preview").show(),e.siblings(".um-set-image").show(),e.siblings(".um-clear-image").hide())}),"undefined"!=typeof wp&&wp.media&&wp.media.editor&&(jQuery(".um-set-image").on("click",function(e){var a=jQuery(this);e.preventDefault(),t&&t.remove(),(t=wp.media({title:a.data("upload_frame"),button:{text:wp.i18n.__("Select","ultimate-member")},multiple:!1})).on("select",function(){var e=t.state().get("selection").first().toJSON();a.siblings(".icon_preview").attr("src",e.url).show(),a.siblings(".um-forms-field").val(e.url),a.siblings(".um-media-upload-data-id").val(e.id),a.siblings(".um-media-upload-data-width").val(e.width),a.siblings(".um-media-upload-data-height").val(e.height),a.siblings(".um-media-upload-data-thumbnail").val(e.thumbnail),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(e.url),a.siblings(".um-clear-image").show(),a.hide(),jQuery(document).trigger("um_media_upload_select",[a,e])}),t.open()}),jQuery(".icon_preview").on("click",function(e){jQuery(this).siblings(".um-set-image").trigger("click")}),jQuery(".um-clear-image").on("click",function(e){var a=jQuery(this),t=a.siblings(".um-forms-field").data("default");a.siblings(".um-set-image").show(),a.hide(),a.siblings(".icon_preview").attr("src",t),a.siblings(".um-media-upload-data-id").val(""),a.siblings(".um-media-upload-data-width").val(""),a.siblings(".um-media-upload-data-height").val(""),a.siblings(".um-media-upload-data-thumbnail").val(""),a.siblings(".um-forms-field").val(t),a.siblings(".um-media-upload-data-url").trigger("change"),a.siblings(".um-media-upload-url").val(t),jQuery(document).trigger("um_media_upload_clear",a)})),jQuery(document.body).on("change",".um-forms-field",function(){(0
');
jQuery('#' + id).prependTo('.um-admin-modal');
@@ -26,81 +63,30 @@ function um_admin_new_modal( id, ajax, size ) {
jQuery('.um-admin-modal-head').append('');
if ( ajax == true ) {
- um_admin_modal_size( size );
- um_admin_modal_preload();
- um_admin_modal_responsive();
+ UM.admin.modal.setSize( size );
+ UM.admin.modal.preload();
+ UM.admin.modal.resize();
} else {
- um_admin_modal_responsive();
+ UM.admin.modal.resize();
}
}
-function um_tinymce_init( id, content ) {
- var object = jQuery('#' + id);
-
- if ( typeof( tinyMCE ) === 'object' && tinyMCE.get( id ) !== null ) {
- tinyMCE.triggerSave();
- tinyMCE.EditorManager.execCommand( 'mceRemoveEditor', true, id );
- "4" === tinyMCE.majorVersion ? window.tinyMCE.execCommand( "mceRemoveEditor", !0, id ) : window.tinyMCE.execCommand( "mceRemoveControl", !0, id );
- $um_tiny_editor = jQuery('').append( object.parents( '#wp-' + id + '-wrap' ).clone() );
- object.parents('#wp-' + id + '-wrap').replaceWith('');
- jQuery('.um-admin-editor:visible').html( jQuery( $um_tiny_editor ).html() );
-
- var init;
- if( typeof tinyMCEPreInit.mceInit[ id ] == 'undefined' ){
- init = tinyMCEPreInit.mceInit[ id ] = tinyMCE.extend( {}, tinyMCEPreInit.mceInit[ id ] );
- } else {
- init = tinyMCEPreInit.mceInit[ id ];
- }
- if ( typeof(QTags) == 'function' ) {
- QTags( tinyMCEPreInit.qtInit[ id ] );
- QTags._buttonsInit();
- }
- if ( typeof( window.switchEditors ) === 'object' ) {
- window.switchEditors.go( id );
- }
- tinyMCE.init( init );
- tinyMCE.get( id ).setContent( content );
- object.html( content );
- } else {
- $um_tiny_editor = jQuery('
').append( object.parents('#wp-' + id + '-wrap').clone() );
- object.parents('#wp-' + id + '-wrap').replaceWith('');
-
- jQuery('.um-admin-editor:visible').html( jQuery( $um_tiny_editor ).html() );
-
- if ( typeof(QTags) == 'function' ) {
- QTags( tinyMCEPreInit.qtInit[ id ] );
- QTags._buttonsInit();
- }
-
- //use duplicate because it's new element
- jQuery('#' + id).html( content );
- }
-
- jQuery( 'body' ).on( 'click', '.wp-switch-editor', function() {
- var target = jQuery(this);
-
- if ( target.hasClass( 'wp-switch-editor' ) && typeof( window.switchEditors ) === 'object' ) {
- var mode = target.hasClass( 'switch-tmce' ) ? 'tmce' : 'html';
- window.switchEditors.go( id, mode );
- }
- });
-}
-
-
function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
- in_row = '';
- in_sub_row = '';
- in_column = '';
- in_group = '';
+ let in_row = '';
+ let in_sub_row = '';
+ let in_column = '';
+ let in_group = '';
- if ( jQuery('.um-col-demon-settings').data('in_column') ) {
- in_row = jQuery('.um-col-demon-settings').data('in_row');
- in_sub_row = jQuery('.um-col-demon-settings').data('in_sub_row');
- in_column = jQuery('.um-col-demon-settings').data('in_column');
- in_group = jQuery('.um-col-demon-settings').data('in_group');
+ let $hiddenModalData = jQuery('.um-col-demon-settings');
+
+ if ( $hiddenModalData.data('in_column') ) {
+ in_row = $hiddenModalData.data('in_row');
+ in_sub_row = $hiddenModalData.data('in_sub_row');
+ in_column = $hiddenModalData.data('in_column');
+ in_group = $hiddenModalData.data('in_group');
}
- var form_mode = jQuery('input[type=hidden][id=form__um_mode]').val();
+ let form_mode = jQuery('input[type="hidden"][id="form__um_mode"]').val();
jQuery.ajax({
url: wp.ajax.settings.url,
@@ -119,36 +105,16 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
form_mode: form_mode
},
complete: function(){
- um_admin_modal_loaded();
- um_admin_modal_responsive();
+ UM.admin.modal.loaded();
+ UM.admin.modal.resize();
},
success: function(data) {
+ let $adminModal = jQuery('.um-admin-modal');
+ $adminModal.find('.um-admin-modal-body').html( data );
- jQuery('.um-admin-modal').find('.um-admin-modal-body').html( data );
+ wp.hooks.doAction( 'um_admin_modal_success_result', $adminModal, act_id );
- wp.hooks.doAction( 'um_admin_modal_success_result', jQuery('.um-admin-modal') );
-
- um_admin_live_update_scripts();
-
- jQuery( "#_custom_dropdown_options_source" ).trigger('blur');
-
- if ( jQuery('.um-admin-editor:visible').length > 0 ) {
-
- if ( act_id == 'um_admin_edit_field_popup' ) {
- um_tinymce_init( 'um_editor_edit', jQuery('.um-admin-modal:visible .dynamic-mce-content').html() );
- } else {
- um_tinymce_init( 'um_editor_new', '' );
- }
-
- }
-
- if ( act_id === 'um_admin_preview_form' ) {
- //fix for overlay in scrollable preview modal
- jQuery('.um-admin-preview-overlay').css('height', jQuery('.um-admin-preview-overlay').siblings('.um').outerHeight(true)*1 + 20 + 'px' );
- }
-
- UM.admin.tooltip.init();
- UM.admin.datetimePicker.init();
+ UM.admin.tooltip.init();
},
error: function(data) {
@@ -157,86 +123,18 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
return false;
}
-function um_admin_modal_responsive() {
- var required_margin = jQuery('.um-admin-modal:visible').innerHeight() / 2 + 'px';
- jQuery('.um-admin-modal:visible').css({'margin-top': '-' + required_margin });
-
- if ( jQuery('#UM_preview_form .um-s1').length ) {
- jQuery("#UM_preview_form .um-s1").select2({
- allowClear: true
- });
- }
-
- if ( jQuery('#UM_preview_form .um-s2').length ) {
- jQuery("#UM_preview_form .um-s2").select2({
- allowClear: false,
- minimumResultsForSearch: 10
- });
- }
-}
-
-function um_admin_remove_modal() {
-
- if ( jQuery('.um-admin-editor:visible').length > 0 ) {
- tinyMCE.triggerSave();
-
- if ( jQuery('.um-admin-modal:visible').find('form').parent().attr('id') == 'UM_edit_field' ) {
- jQuery('#wp-um_editor_edit-wrap').remove();
-
- /*tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_edit');
- jQuery('.um-hidden-editor-edit').html( jQuery('.um-admin-editor:visible').contents() );
- tinyMCE.execCommand('mceAddEditor', true, 'um_editor_edit');*/
-
- } else {
- jQuery('#wp-um_editor_new-wrap').remove();
-
- /*tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_new');
- jQuery('.um-hidden-editor-new').html( jQuery('.um-admin-editor:visible').contents() );
- tinyMCE.execCommand('mceAddEditor', true, 'um_editor_new');*/
-
- }
-
- jQuery('.um_tiny_placeholder').replaceWith( jQuery( $um_tiny_editor ).html() );
- }
-
- UM.admin.tooltip.close();
- UM.common.tipsy.hide();
- jQuery('body').removeClass('um-admin-modal-open');
- jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo('body');
- jQuery('.um-admin-modal,.um-admin-overlay').remove();
-}
-
-function um_admin_modal_preload() {
- jQuery('.um-admin-modal:visible').addClass('loading');
- jQuery('.um-admin-modal-body:visible').empty();
-}
-
-function um_admin_modal_loaded() {
- jQuery('.um-admin-modal:visible').removeClass('loading');
-}
-
-function um_admin_modal_size( aclass ) {
- jQuery('.um-admin-modal:visible').addClass(aclass);
-}
-
-function um_admin_modal_add_attr( id, value ) {
- jQuery('.um-admin-modal:visible').data( id, value );
-}
-
/**
Custom modal scripting starts
**/
jQuery(document).ready(function() {
-
-
/**
remove modal via action
**/
jQuery(document.body).on('click', '.um-admin-overlay, a[data-action="UM_remove_modal"]', function(){
UM.common.tipsy.hide();
- um_admin_remove_modal();
+ UM.admin.modal.remove();
});
/**
@@ -268,8 +166,6 @@ jQuery(document).ready(function() {
});
-
-
/**
submit font icon
**/
@@ -289,7 +185,7 @@ jQuery(document).ready(function() {
jQuery(this).attr('data-code', '');
if ( v_id == '.postbox' ) {
UM.common.tipsy.hide();
- um_admin_remove_modal();
+ UM.admin.modal.remove();
}
});
@@ -318,8 +214,6 @@ jQuery(document).ready(function() {
} else {
jQuery('.um-admin-icons span:hidden').show();
}
- um_admin_modal_responsive();
+ UM.admin.modal.resize();
});
-
-}); // end jQuery(document).ready
-
+});
diff --git a/assets/js/admin/modal.min.js b/assets/js/admin/modal.min.js
index 3d347ef9..10b9c6c7 100644
--- a/assets/js/admin/modal.min.js
+++ b/assets/js/admin/modal.min.js
@@ -1 +1 @@
-var $um_tiny_editor={};function um_admin_live_update_scripts(){jQuery(".um-adm-conditional").each(function(){jQuery(this).trigger("change")}),jQuery(".um-admin-colorpicker").length&&jQuery(".um-admin-colorpicker").wpColorPicker()}function um_admin_new_modal(i,e,n){jQuery("body").find(".um-admin-overlay");UM.common.tipsy.hide(),um_admin_remove_modal(),jQuery("body").addClass("um-admin-modal-open").append(''),jQuery("#"+i).prependTo(".um-admin-modal"),jQuery("#"+i).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==e&&(um_admin_modal_size(n),um_admin_modal_preload()),um_admin_modal_responsive()}function um_tinymce_init(e,i){var n,a=jQuery("#"+e);("object"==typeof tinyMCE&&null!==tinyMCE.get(e)?(tinyMCE.triggerSave(),tinyMCE.EditorManager.execCommand("mceRemoveEditor",!0,e),"4"===tinyMCE.majorVersion?window.tinyMCE.execCommand("mceRemoveEditor",!0,e):window.tinyMCE.execCommand("mceRemoveControl",!0,e),$um_tiny_editor=jQuery("
").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith(''),jQuery(".um-admin-editor:visible").html(jQuery($um_tiny_editor).html()),n=void 0===tinyMCEPreInit.mceInit[e]?tinyMCEPreInit.mceInit[e]=tinyMCE.extend({},tinyMCEPreInit.mceInit[e]):tinyMCEPreInit.mceInit[e],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(e),tinyMCE.init(n),tinyMCE.get(e).setContent(i),a):($um_tiny_editor=jQuery("
").append(a.parents("#wp-"+e+"-wrap").clone()),a.parents("#wp-"+e+"-wrap").replaceWith(''),jQuery(".um-admin-editor:visible").html(jQuery($um_tiny_editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[e]),QTags._buttonsInit()),jQuery("#"+e))).html(i),jQuery("body").on("click",".wp-switch-editor",function(){var i=jQuery(this);i.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(i=i.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(e,i))})}function um_admin_modal_ajaxcall(e,i,n,a){in_row="",in_sub_row="",in_column="",in_group="",jQuery(".um-col-demon-settings").data("in_column")&&(in_row=jQuery(".um-col-demon-settings").data("in_row"),in_sub_row=jQuery(".um-col-demon-settings").data("in_sub_row"),in_column=jQuery(".um-col-demon-settings").data("in_column"),in_group=jQuery(".um-col-demon-settings").data("in_group"));var m=jQuery("input[type=hidden][id=form__um_mode]").val();return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:e,arg1:i,arg2:n,arg3:a,in_row:in_row,in_sub_row:in_sub_row,in_column:in_column,in_group:in_group,nonce:um_admin_scripts.nonce,form_mode:m},complete:function(){um_admin_modal_loaded(),um_admin_modal_responsive()},success:function(i){jQuery(".um-admin-modal").find(".um-admin-modal-body").html(i),wp.hooks.doAction("um_admin_modal_success_result",jQuery(".um-admin-modal")),um_admin_live_update_scripts(),jQuery("#_custom_dropdown_options_source").trigger("blur"),0'),jQuery(i).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==i&&(UM.common.tipsy.hide(),um_admin_remove_modal())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var i=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),i.find('input[type="hidden"]').val(""),i.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(i=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),i.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),um_admin_modal_responsive()})});
\ No newline at end of file
+function um_admin_new_modal(a,i,n){jQuery("body").find(".um-admin-overlay");UM.common.tipsy.hide(),UM.admin.modal.remove(),jQuery("body").addClass("um-admin-modal-open").append(''),jQuery("#"+a).prependTo(".um-admin-modal"),jQuery("#"+a).show(),jQuery(".um-admin-modal").show(),jQuery(".um-admin-modal-head").append(''),1==i&&(UM.admin.modal.setSize(n),UM.admin.modal.preload()),UM.admin.modal.resize()}function um_admin_modal_ajaxcall(n,a,i,d){let o="",e="",m="",t="";var u=jQuery(".um-col-demon-settings"),u=(u.data("in_column")&&(o=u.data("in_row"),e=u.data("in_sub_row"),m=u.data("in_column"),t=u.data("in_group")),jQuery('input[type="hidden"][id="form__um_mode"]').val());return jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:{action:"um_dynamic_modal_content",act_id:n,arg1:a,arg2:i,arg3:d,in_row:o,in_sub_row:e,in_column:m,in_group:t,nonce:um_admin_scripts.nonce,form_mode:u},complete:function(){UM.admin.modal.loaded(),UM.admin.modal.resize()},success:function(a){var i=jQuery(".um-admin-modal");i.find(".um-admin-modal-body").html(a),wp.hooks.doAction("um_admin_modal_success_result",i,n),UM.admin.tooltip.init()},error:function(a){}}),!1}"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof window.UM.admin&&(window.UM.admin={}),UM.admin.modal={preload:function(){jQuery(".um-admin-modal:visible").addClass("loading"),jQuery(".um-admin-modal-body:visible").empty()},loaded:function(){jQuery(".um-admin-modal:visible").removeClass("loading")},setSize:function(a){jQuery(".um-admin-modal:visible").addClass(a)},setAttr:function(a,i){jQuery(".um-admin-modal:visible").data(a,i)},remove:function(){wp.hooks.doAction("um_admin_modal_remove"),UM.admin.tooltip.close(),UM.common.tipsy.hide(),jQuery("body").removeClass("um-admin-modal-open"),jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo("body"),jQuery(".um-admin-modal,.um-admin-overlay").remove()},resize:function(){var a=jQuery(".um-admin-modal:visible").innerHeight()/2+"px";jQuery(".um-admin-modal:visible").css({"margin-top":"-"+a}),jQuery("#UM_preview_form .um-s1").length&&jQuery("#UM_preview_form .um-s1").select2({allowClear:!0}),jQuery("#UM_preview_form .um-s2").length&&jQuery("#UM_preview_form .um-s2").select2({allowClear:!1,minimumResultsForSearch:10})}},jQuery(document).ready(function(){jQuery(document.body).on("click",'.um-admin-overlay, a[data-action="UM_remove_modal"]',function(){UM.common.tipsy.hide(),UM.admin.modal.remove()}),jQuery(document.body).on("click",'a[data-modal^="UM_"], span[data-modal^="UM_"]',function(a){a.preventDefault();a=jQuery(this).attr("data-modal");return jQuery(this).attr("data-back")&&(jQuery("#UM_fonticons").find("a.um-admin-modal-back").attr("data-modal",jQuery(this).attr("data-back")),""==jQuery("#"+jQuery(this).attr("data-back")).find("input#_icon").val())&&jQuery("#UM_fonticons").find(".um-admin-icons span").removeClass("highlighted"),jQuery(this).data("dynamic-content")?(um_admin_new_modal(a,!0,jQuery(this).data("modal-size")),um_admin_modal_ajaxcall(jQuery(this).data("dynamic-content"),jQuery(this).data("arg1"),jQuery(this).data("arg2"),jQuery(this).data("arg3"))):um_admin_new_modal(a),!1}),jQuery(document.body).on("click","#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)",function(){var a="",i=jQuery(this).attr("data-code");""!=i&&(a=jQuery(this).attr("data-modal")?"#"+jQuery(this).attr("data-modal"):".postbox",jQuery(a).find("input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon").val(i),jQuery(a).find("span.um-admin-icon-value").html(''),jQuery(a).find(".um-admin-icon-clear").show()),jQuery(this).attr("data-code",""),".postbox"==a&&(UM.common.tipsy.hide(),UM.admin.modal.remove())}),jQuery(document.body).on("click","span.um-admin-icon-clear",function(){var a=jQuery(this).parents("p");jQuery("#UM_fonticons a.um-admin-modal-back").attr("data-code",""),a.find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),(a=jQuery(this).parents("td")).find('input[type="hidden"]').val(""),a.find(".um-admin-icon-value").html(wp.i18n.__("No Icon","ultimate-member")),jQuery(this).hide()}),jQuery(document.body).on("keyup blur","#_icon_search",function(){(""!==jQuery(this).val().toLowerCase()?(jQuery(".um-admin-icons span").hide(),jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]')):jQuery(".um-admin-icons span:hidden")).show(),UM.admin.modal.resize()})});
\ No newline at end of file
diff --git a/assets/js/common.js b/assets/js/common.js
index 9940c1e8..cfb20350 100644
--- a/assets/js/common.js
+++ b/assets/js/common.js
@@ -25,6 +25,86 @@ UM.common = {
jQuery('.um .tipsy').remove();
}
}
+ },
+ datetimePicker: {
+ init: function () {
+ jQuery('.um-datepicker:not(.picker__input)').each(function(){
+ elem = jQuery(this);
+
+ if ( typeof elem.attr('data-disabled_weekdays') != 'undefined' && elem.attr('data-disabled_weekdays') != '' ) {
+ var disable = JSON.parse( elem.attr('data-disabled_weekdays') );
+ } else {
+ var disable = false;
+ }
+
+ var years_n = null;
+ if ( typeof elem.attr('data-years') != 'undefined' ) {
+ years_n = elem.attr('data-years');
+ }
+
+ var minRange = elem.attr('data-date_min');
+ var maxRange = elem.attr('data-date_max');
+
+ var minSplit = [], maxSplit = [];
+ if ( typeof minRange != 'undefined' ) {
+ minSplit = minRange.split(",");
+ }
+ if ( typeof maxRange != 'undefined' ) {
+ maxSplit = maxRange.split(",");
+ }
+
+ var min = minSplit.length ? new Date(minSplit) : null;
+ var max = minSplit.length ? new Date(maxSplit) : null;
+
+ // fix min date for safari
+ if ( min && min.toString() == 'Invalid Date' && minSplit.length == 3 ) {
+ var minDateString = minSplit[1] + '/' + minSplit[2] + '/' + minSplit[0];
+ min = new Date(Date.parse(minDateString));
+ }
+
+ // fix max date for safari
+ if ( max && max.toString() == 'Invalid Date' && maxSplit.length == 3 ) {
+ var maxDateString = maxSplit[1] + '/' + maxSplit[2] + '/' + maxSplit[0];
+ max = new Date(Date.parse(maxDateString));
+ }
+
+ var data = {
+ disable: disable,
+ format: elem.attr( 'data-format' ),
+ formatSubmit: 'yyyy/mm/dd',
+ hiddenName: true,
+ onOpen: function() { elem.blur(); },
+ onClose: function() { elem.blur(); }
+ };
+
+ if ( years_n !== null ) {
+ data.selectYears = years_n;
+ }
+
+ if ( min !== null ) {
+ data.min = min;
+ }
+
+ if ( max !== null ) {
+ data.max = max;
+ }
+
+ elem.pickadate( data );
+ });
+
+ jQuery('.um-timepicker:not(.picker__input)').each(function(){
+ elem = jQuery(this);
+
+ elem.pickatime({
+ format: elem.attr('data-format'),
+ interval: parseInt( elem.attr('data-intervals') ),
+ formatSubmit: 'HH:i',
+ hiddenName: true,
+ onOpen: function() { elem.blur(); },
+ onClose: function() { elem.blur(); }
+ });
+ });
+ }
}
}
@@ -59,4 +139,5 @@ jQuery(document).on( 'ajaxSuccess', function() {
jQuery(document).ready(function() {
UM.common.tipsy.init();
+ UM.common.datetimePicker.init();
});
diff --git a/assets/js/common.min.js b/assets/js/common.min.js
index 27edc98c..85624e94 100644
--- a/assets/js/common.min.js
+++ b/assets/js/common.min.js
@@ -1 +1 @@
-"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}}},jQuery.ajaxSetup({beforeSend:function(e,t){return t.processData?""!==t.data?t.data+="&um_current_locale="+um_common_variables.locale:t.data="um_current_locale="+um_common_variables.locale:t.data=jQuery.extend(t.data,{um_current_locale:um_common_variables.locale}),!0}}),jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init()});
\ No newline at end of file
+"object"!=typeof window.UM&&(window.UM={}),"object"!=typeof UM.common&&(UM.common={}),UM.common={tipsy:{init:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy({gravity:"n",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-w").tipsy({gravity:"w",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-e").tipsy({gravity:"e",opacity:1,live:"a.live",offset:3}),jQuery(".um-tip-s").tipsy({gravity:"s",opacity:1,live:"a.live",offset:3}))},hide:function(){"function"==typeof jQuery.fn.tipsy&&(jQuery(".um-tip-n").tipsy("hide"),jQuery(".um-tip-w").tipsy("hide"),jQuery(".um-tip-e").tipsy("hide"),jQuery(".um-tip-s").tipsy("hide"),jQuery(".um .tipsy").remove())}},datetimePicker:{init:function(){jQuery(".um-datepicker:not(.picker__input)").each(function(){e=void 0!==(elem=jQuery(this)).attr("data-disabled_weekdays")&&""!=elem.attr("data-disabled_weekdays")&&JSON.parse(elem.attr("data-disabled_weekdays"));var e,t=null,a=(void 0!==elem.attr("data-years")&&(t=elem.attr("data-years")),elem.attr("data-date_min")),i=elem.attr("data-date_max"),n=[],o=[],a=(void 0!==a&&(n=a.split(",")),void 0!==i&&(o=i.split(",")),n.length?new Date(n):null),i=n.length?new Date(o):null,o=(a&&"Invalid Date"==a.toString()&&3==n.length&&(n=n[1]+"/"+n[2]+"/"+n[0],a=new Date(Date.parse(n))),i&&"Invalid Date"==i.toString()&&3==o.length&&(n=o[1]+"/"+o[2]+"/"+o[0],i=new Date(Date.parse(n))),{disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}});null!==t&&(o.selectYears=t),null!==a&&(o.min=a),null!==i&&(o.max=i),elem.pickadate(o)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){(elem=jQuery(this)).pickatime({format:elem.attr("data-format"),interval:parseInt(elem.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})})}}},jQuery.ajaxSetup({beforeSend:function(e,t){return t.processData?""!==t.data?t.data+="&um_current_locale="+um_common_variables.locale:t.data="um_current_locale="+um_common_variables.locale:t.data=jQuery.extend(t.data,{um_current_locale:um_common_variables.locale}),!0}}),jQuery(document).on("ajaxStart",function(){UM.common.tipsy.hide()}),jQuery(document).on("ajaxSuccess",function(){UM.common.tipsy.init()}),jQuery(document).ready(function(){UM.common.tipsy.init(),UM.common.datetimePicker.init()});
\ No newline at end of file
diff --git a/assets/js/um-responsive.min.js b/assets/js/um-responsive.min.js
index b06beafd..d8114ef6 100644
--- a/assets/js/um-responsive.min.js
+++ b/assets/js/um-responsive.min.js
@@ -1 +1 @@
-jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()}),wp.hooks.addAction("um_admin_modal_success_result","um_frontend_responsive",function(o){console.log(123131232),o.find(".um-admin-modal-body").find(".um").length&&um_responsive()});
\ No newline at end of file
+jQuery(window).on("load",function(){um_responsive(),um_modal_responsive()}),jQuery(window).on("resize",function(){responsive_Modal(),wp.hooks.doAction("um_window_resize"),um_responsive(),um_modal_responsive()}),wp.hooks.addAction("um_admin_modal_success_result","um_frontend_responsive",function(o){o.find(".um-admin-modal-body").find(".um").length&&um_responsive()});
\ No newline at end of file
diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index 4f41a742..922f8917 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -16,85 +16,6 @@ function um_unsanitize_value( input ) {
return e.childNodes.length === 0 ? "" : e.childNodes[0].nodeValue;
}
-
-function um_init_datetimepicker() {
- jQuery('.um-datepicker:not(.picker__input)').each(function(){
- var elem = jQuery(this);
-
- var disable = false;
- if ( typeof elem.attr('data-disabled_weekdays') != 'undefined' && elem.attr('data-disabled_weekdays') !== '' ) {
- disable = JSON.parse( elem.attr('data-disabled_weekdays') );
- }
-
- var years_n = null;
- if ( typeof elem.attr('data-years') != 'undefined' ) {
- years_n = elem.attr('data-years');
- }
-
- var minRange = elem.attr('data-date_min');
- var maxRange = elem.attr('data-date_max');
-
- var minSplit = [], maxSplit = [];
- if ( typeof minRange != 'undefined' ) {
- minSplit = minRange.split(",");
- }
- if ( typeof maxRange != 'undefined' ) {
- maxSplit = maxRange.split(",");
- }
-
- var min = minSplit.length ? new Date(minSplit) : null;
- var max = minSplit.length ? new Date(maxSplit) : null;
-
- // fix min date for safari
- if ( min && min.toString() == 'Invalid Date' && minSplit.length == 3 ) {
- var minDateString = minSplit[1] + '/' + minSplit[2] + '/' + minSplit[0];
- min = new Date(Date.parse(minDateString));
- }
-
- // fix max date for safari
- if ( max && max.toString() == 'Invalid Date' && maxSplit.length == 3 ) {
- var maxDateString = maxSplit[1] + '/' + maxSplit[2] + '/' + maxSplit[0];
- max = new Date(Date.parse(maxDateString));
- }
-
- var data = {
- disable: disable,
- format: elem.attr( 'data-format' ),
- formatSubmit: 'yyyy/mm/dd',
- hiddenName: true,
- onOpen: function() { elem.blur(); },
- onClose: function() { elem.blur(); }
- };
-
- if ( years_n !== null ) {
- data.selectYears = years_n;
- }
-
- if ( min !== null ) {
- data.min = min;
- }
-
- if ( max !== null ) {
- data.max = max;
- }
-
- elem.pickadate( data );
- });
-
- jQuery('.um-timepicker:not(.picker__input)').each(function(){
- var elem = jQuery(this);
-
- elem.pickatime({
- format: elem.attr('data-format'),
- interval: parseInt( elem.attr('data-intervals') ),
- formatSubmit: 'HH:i',
- hiddenName: true,
- onOpen: function() { elem.blur(); },
- onClose: function() { elem.blur(); }
- });
- });
-}
-
jQuery(document).ready(function() {
jQuery( document.body ).on('click', '.um-dropdown a.real_url', function() {
@@ -242,9 +163,6 @@ jQuery(document).ready(function() {
}
});
-
- um_init_datetimepicker();
-
jQuery(document.body).on('click', '.um-single-image-preview a.cancel', function(e) {
e.preventDefault();
diff --git a/assets/js/um-scripts.min.js b/assets/js/um-scripts.min.js
index e6611f78..db20c34a 100644
--- a/assets/js/um-scripts.min.js
+++ b/assets/js/um-scripts.min.js
@@ -1 +1 @@
-function um_sanitize_value(e,t){var a=document.createElement("div"),e=(a.innerText=e,a.innerHTML);return t&&jQuery(t).val(e),e}function um_unsanitize_value(e){var t=document.createElement("textarea");return t.innerHTML=e,0===t.childNodes.length?"":t.childNodes[0].nodeValue}function um_init_datetimepicker(){jQuery(".um-datepicker:not(.picker__input)").each(function(){var e=jQuery(this),t=!1,a=(void 0!==e.attr("data-disabled_weekdays")&&""!==e.attr("data-disabled_weekdays")&&(t=JSON.parse(e.attr("data-disabled_weekdays"))),null),n=(void 0!==e.attr("data-years")&&(a=e.attr("data-years")),e.attr("data-date_min")),i=e.attr("data-date_max"),r=[],u=[],n=(void 0!==n&&(r=n.split(",")),void 0!==i&&(u=i.split(",")),r.length?new Date(r):null),i=r.length?new Date(u):null,u=(n&&"Invalid Date"==n.toString()&&3==r.length&&(r=r[1]+"/"+r[2]+"/"+r[0],n=new Date(Date.parse(r))),i&&"Invalid Date"==i.toString()&&3==u.length&&(r=u[1]+"/"+u[2]+"/"+u[0],i=new Date(Date.parse(r))),{disable:t,format:e.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()}});null!==a&&(u.selectYears=a),null!==n&&(u.min=n),null!==i&&(u.max=i),e.pickadate(u)}),jQuery(".um-timepicker:not(.picker__input)").each(function(){var e=jQuery(this);e.pickatime({format:e.attr("data-format"),interval:parseInt(e.attr("data-intervals")),formatSubmit:"HH:i",hiddenName:!0,onOpen:function(){e.blur()},onClose:function(){e.blur()}})})}jQuery(document).ready(function(){function n(e){var a=jQuery(e.currentTarget),e=a.find(":selected");1![]()
'),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".um-btn-auto-width").html(a.data("upload-label")),a.find('input[type="hidden"]').val("empty_file")}},"register"!==n&&(r.data.user_id=jQuery(this).parents("form").find("#user_id").val())),wp.ajax.send("um_remove_file",r)}),jQuery(document.body).on("click",".um-single-file-preview a.cancel",function(e){e.preventDefault();let t=!1;0![]()
'),a.find(".um-single-image-preview").removeAttr("style").hide(),a.find(".um-btn-auto-width").html(a.data("upload-label")),a.find('input[type="hidden"]').val("empty_file")}},"register"!==n&&(r.data.user_id=jQuery(this).parents("form").find("#user_id").val())),wp.ajax.send("um_remove_file",r)}),jQuery(document.body).on("click",".um-single-file-preview a.cancel",function(e){e.preventDefault();let t=!1;0 p:not(:first-child) {
- border-top: 1px solid #e5e5e5;
-}
-
-.um-admin-infobox > .um-row > p {
- border-top: 1px solid #e5e5e5;
-}
-
-.um-admin-infobox > p:first-child {
- margin-top: 0;
- padding-top: 0;
-}
-
-.um-admin-infobox label {
- font-weight: bold;
- display: block;
- color: #333;
- cursor: default;
-}
-
-/*
- - Conditional fields
-*/
-
-.um-admin-btn-toggle {
- padding: 10px 0;
-}
-
-.um-admin-btn-toggle p {
- margin: 0 5px 0 0 !important;
-}
-
-.um-admin-btn-toggle p.um-admin-reset-conditions {
- margin: 0 0 5px 0 !important;
-}
-
-.um-admin-btn-toggle a {
- text-decoration: none;
- color: #999;
-}
-
-.um-admin-btn-toggle a.active, .um-admin-btn-toggle a.active:hover {
- color: #0085ba;
-}
-
-.um-admin-btn-toggle i {
- margin: 0 5px 0 0 !important;
- height: 100%;
- color: #666;
- position: relative;
- top: 1px;
-}
-
-.um-admin-btn-content {
- display: none;
- padding: 5px 0 0 0;
-}
-
-.um-admin-btn-content p {
- float: left;
- margin-right: 10px !important;
- padding: 0 !important;
-}
-
-.um-admin-btn-content p.um-admin-conditions-notice {
- width: 100%;
- margin: 0 0 9px 0 !important;
-}
-
-.um-admin-btn-content .um-admin-cur-condition:not(:last-child) {
- margin: 0 0 5px 0;
-}
-
-.dynamic-mce-content {display: none}
-
-/*
- - Buttons and Links
-*/
-
-.um-admin-btns {
- line-height: 1.5em;
- margin: 0 0 5px 0;
-}
-
-.um-admin-btns a {
- margin: 0 3px 8px 0!important;
- font-size: 12px !important;
- display: inline-block !important;
- position: relative;
-}
-
-.um-admin-btns a.button.with-icon {
- padding-right: 25px !important;
-}
-.um-admin-btns a span {
- color: #aaa;
- position: absolute !important;
- width: 25px;
- text-align: center;
- right: 0;
- top: 0;
- font-size: 15px !important;
-}
-
-.um-admin-btns a span.remove:before{
- font-family: "Ionicons" !important;
- content: "\f128";
-}
-.um-admin-btns a span:hover{color: #cb3838}
-
-/*
- - WP Editor
-*/
-
-.um-admin-modal-body.um-admin-metabox .um-admin-editor-h {
- margin-top: 12px;
-}
-
-.um-admin-modal-body.um-admin-metabox .um-admin-editor-h label,
-.um-admin-modal-body.um-admin-metabox .wp-editor-wrap
-{margin: 0 0 4px 0 !important}
-
-.um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea {
- border: 0 !important;
-}
-
-/*
- - Boxes / Icons
-*/
-
-#UM_fonticons div.um-admin-metabox {
- padding-bottom: 22px !important;
-}
-
-p._icon_search{
- position: relative;
- width: 85% !important;
- margin: 0 auto !important;
- padding: 12px 0 0 0 !important;
-}
-
-p._icon_search:before {
- position: absolute;
- right: 6px;
- top: 12px;
- font-size: 20px;
- content: "\f4a4";
- font-family: "Ionicons";
- color: #999;
-}
-p._icon_search input[type=text]{padding-right: 40px!important}
-
-.um-admin-icons {
- padding: 0 0 15px 12px;
- float: left;
-}
-
-.um-admin-icons span {
- cursor: pointer;
- float: left;
- margin: 5px;
- color: #777;
- border: 4px solid #eee;
- border-radius: 3px;
-}
-.um-admin-icons span:hover,
-.um-admin-icons span.highlighted
-{color: #0085ba;border-color: #0085ba}
-
-.um-admin-icons i{vertical-align: middle !important;font-size: 24px;width: 24px;text-align: center;padding: 15px 20px;display: inline-block;}
-
-span.um-admin-icon-value {
- margin: 0 10px;
- font-size: 13px;
-}
-span.um-admin-icon-value i {
- font-size: 28px;
- color: #0085ba;
- position: relative;
- top: 5px;
-}
-
-span.um-admin-icon-clear{
- display: none;
- cursor: pointer;
- position: relative;
- color: #ccc;
-}
-span.um-admin-icon-clear.show {display: inline-block}
-span.um-admin-icon-clear:hover {color: #777}
-span.um-admin-icon-clear i {font-size: 20px;vertical-align: middle;}
diff --git a/includes/admin/assets/img/ajax-loader.gif b/includes/admin/assets/img/ajax-loader.gif
deleted file mode 100644
index 1455a255..00000000
Binary files a/includes/admin/assets/img/ajax-loader.gif and /dev/null differ
diff --git a/includes/admin/assets/js/um-admin-modal.js b/includes/admin/assets/js/um-admin-modal.js
deleted file mode 100644
index 8d9df534..00000000
--- a/includes/admin/assets/js/um-admin-modal.js
+++ /dev/null
@@ -1,324 +0,0 @@
-var $um_tiny_editor = {};
-
-
-function um_admin_live_update_scripts() {
- jQuery('.um-adm-conditional').each( function() {
- jQuery(this).trigger('change');
- });
-
- if ( jQuery('.um-admin-colorpicker').length ) {
- jQuery('.um-admin-colorpicker').wpColorPicker();
- }
-}
-
-function um_admin_new_modal( id, ajax, size ) {
- var modal = jQuery('body').find('.um-admin-overlay');
-
- UM.common.tipsy.hide();
-
- um_admin_remove_modal();
-
- jQuery('body').addClass('um-admin-modal-open').append('');
- jQuery('#' + id).prependTo('.um-admin-modal');
- jQuery('#' + id).show();
- jQuery('.um-admin-modal').show();
-
- jQuery('.um-admin-modal-head').append('');
-
- if ( ajax == true ) {
- um_admin_modal_size( size );
- um_admin_modal_preload();
- um_admin_modal_responsive();
- } else {
- um_admin_modal_responsive();
- }
-}
-
-function um_tinymce_init( id, content ) {
- var object = jQuery('#' + id);
-
- if ( typeof( tinyMCE ) === 'object' && tinyMCE.get( id ) !== null ) {
- tinyMCE.triggerSave();
- tinyMCE.EditorManager.execCommand( 'mceRemoveEditor', true, id );
- "4" === tinyMCE.majorVersion ? window.tinyMCE.execCommand( "mceRemoveEditor", !0, id ) : window.tinyMCE.execCommand( "mceRemoveControl", !0, id );
- $um_tiny_editor = jQuery('
').append( object.parents( '#wp-' + id + '-wrap' ).clone() );
- object.parents('#wp-' + id + '-wrap').replaceWith('');
- jQuery('.um-admin-editor:visible').html( jQuery( $um_tiny_editor ).html() );
-
- var init;
- if( typeof tinyMCEPreInit.mceInit[ id ] == 'undefined' ){
- init = tinyMCEPreInit.mceInit[ id ] = tinyMCE.extend( {}, tinyMCEPreInit.mceInit[ id ] );
- } else {
- init = tinyMCEPreInit.mceInit[ id ];
- }
- if ( typeof(QTags) == 'function' ) {
- QTags( tinyMCEPreInit.qtInit[ id ] );
- QTags._buttonsInit();
- }
- if ( typeof( window.switchEditors ) === 'object' ) {
- window.switchEditors.go( id );
- }
- tinyMCE.init( init );
- tinyMCE.get( id ).setContent( content );
- object.html( content );
- } else {
- $um_tiny_editor = jQuery('
').append( object.parents('#wp-' + id + '-wrap').clone() );
- object.parents('#wp-' + id + '-wrap').replaceWith('');
-
- jQuery('.um-admin-editor:visible').html( jQuery( $um_tiny_editor ).html() );
-
- if ( typeof(QTags) == 'function' ) {
- QTags( tinyMCEPreInit.qtInit[ id ] );
- QTags._buttonsInit();
- }
-
- //use duplicate because it's new element
- jQuery('#' + id).html( content );
- }
-
- jQuery( 'body' ).on( 'click', '.wp-switch-editor', function() {
- var target = jQuery(this);
-
- if ( target.hasClass( 'wp-switch-editor' ) && typeof( window.switchEditors ) === 'object' ) {
- var mode = target.hasClass( 'switch-tmce' ) ? 'tmce' : 'html';
- window.switchEditors.go( id, mode );
- }
- });
-}
-
-
-function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
- in_row = '';
- in_sub_row = '';
- in_column = '';
- in_group = '';
-
- if ( jQuery('.um-col-demon-settings').data('in_column') ) {
- in_row = jQuery('.um-col-demon-settings').data('in_row');
- in_sub_row = jQuery('.um-col-demon-settings').data('in_sub_row');
- in_column = jQuery('.um-col-demon-settings').data('in_column');
- in_group = jQuery('.um-col-demon-settings').data('in_group');
- }
-
- var form_mode = jQuery('input[type=hidden][id=form__um_mode]').val();
-
- jQuery.ajax({
- url: wp.ajax.settings.url,
- type: 'POST',
- data: {
- action:'um_dynamic_modal_content',
- act_id: act_id,
- arg1 : arg1,
- arg2 : arg2,
- arg3: arg3,
- in_row: in_row,
- in_sub_row: in_sub_row,
- in_column: in_column,
- in_group: in_group,
- nonce: um_admin_scripts.nonce,
- form_mode: form_mode
- },
- complete: function(){
- um_admin_modal_loaded();
- um_admin_modal_responsive();
- },
- success: function(data) {
-
- jQuery('.um-admin-modal').find('.um-admin-modal-body').html( data );
-
- um_responsive();
- um_admin_live_update_scripts();
-
- jQuery( "#_custom_dropdown_options_source" ).trigger('blur');
-
- if ( jQuery('.um-admin-editor:visible').length > 0 ) {
-
- if ( act_id == 'um_admin_edit_field_popup' ) {
- um_tinymce_init( 'um_editor_edit', jQuery('.um-admin-modal:visible .dynamic-mce-content').html() );
- } else {
- um_tinymce_init( 'um_editor_new', '' );
- }
-
- }
-
- if ( act_id === 'um_admin_preview_form' ) {
- //fix for overlay in scrollable preview modal
- jQuery('.um-admin-preview-overlay').css('height', jQuery('.um-admin-preview-overlay').siblings('.um').outerHeight(true)*1 + 20 + 'px' );
- }
-
- UM.admin.tooltip.init();
- UM.admin.datetimePicker.init();
- },
- error: function(data) {
-
- }
- });
- return false;
-}
-
-function um_admin_modal_responsive() {
- var required_margin = jQuery('.um-admin-modal:visible').innerHeight() / 2 + 'px';
- jQuery('.um-admin-modal:visible').css({'margin-top': '-' + required_margin });
-
- if ( jQuery('#UM_preview_form .um-s1').length ) {
- jQuery("#UM_preview_form .um-s1").select2({
- allowClear: true
- });
- }
-
- if ( jQuery('#UM_preview_form .um-s2').length ) {
- jQuery("#UM_preview_form .um-s2").select2({
- allowClear: false,
- minimumResultsForSearch: 10
- });
- }
-}
-
-function um_admin_remove_modal() {
-
- if ( jQuery('.um-admin-editor:visible').length > 0 ) {
- tinyMCE.triggerSave();
-
- if ( jQuery('.um-admin-modal:visible').find('form').parent().attr('id') == 'UM_edit_field' ) {
- jQuery('#wp-um_editor_edit-wrap').remove();
-
- /*tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_edit');
- jQuery('.um-hidden-editor-edit').html( jQuery('.um-admin-editor:visible').contents() );
- tinyMCE.execCommand('mceAddEditor', true, 'um_editor_edit');*/
-
- } else {
- jQuery('#wp-um_editor_new-wrap').remove();
-
- /*tinyMCE.execCommand('mceRemoveEditor', true, 'um_editor_new');
- jQuery('.um-hidden-editor-new').html( jQuery('.um-admin-editor:visible').contents() );
- tinyMCE.execCommand('mceAddEditor', true, 'um_editor_new');*/
-
- }
-
- jQuery('.um_tiny_placeholder').replaceWith( jQuery( $um_tiny_editor ).html() );
- }
-
- UM.admin.tooltip.close();
- UM.common.tipsy.hide();
- jQuery('body').removeClass('um-admin-modal-open');
- jQuery('.um-admin-modal div[id^="UM_"]').hide().appendTo('body');
- jQuery('.um-admin-modal,.um-admin-overlay').remove();
-}
-
-function um_admin_modal_preload() {
- jQuery('.um-admin-modal:visible').addClass('loading');
- jQuery('.um-admin-modal-body:visible').empty();
-}
-
-function um_admin_modal_loaded() {
- jQuery('.um-admin-modal:visible').removeClass('loading');
-}
-
-function um_admin_modal_size( aclass ) {
- jQuery('.um-admin-modal:visible').addClass(aclass);
-}
-
-function um_admin_modal_add_attr( id, value ) {
- jQuery('.um-admin-modal:visible').data( id, value );
-}
-
-/**
- Custom modal scripting starts
-**/
-
-jQuery(document).ready(function() {
-
-
-
- /**
- remove modal via action
- **/
- jQuery(document.body).on('click', '.um-admin-overlay, a[data-action="UM_remove_modal"]', function(){
- UM.common.tipsy.hide();
- um_admin_remove_modal();
- });
-
- /**
- fire new modal
- **/
- jQuery(document.body).on('click', 'a[data-modal^="UM_"], span[data-modal^="UM_"]', function(e){
- e.preventDefault();
-
- var modal_id = jQuery(this).attr('data-modal');
-
- if ( jQuery(this).attr('data-back') ) {
-
- jQuery('#UM_fonticons').find('a.um-admin-modal-back').attr("data-modal", jQuery(this).attr('data-back') );
- var current_icon = jQuery( '#' + jQuery(this).attr('data-back') ).find('input#_icon').val();
- if ( current_icon == '' ) {
- jQuery('#UM_fonticons').find('.um-admin-icons span').removeClass('highlighted');
- }
-
- }
-
- if ( jQuery(this).data('dynamic-content') ) {
- um_admin_new_modal( modal_id, true, jQuery(this).data('modal-size') );
- um_admin_modal_ajaxcall( jQuery(this).data('dynamic-content'), jQuery(this).data('arg1'), jQuery(this).data('arg2'), jQuery(this).data('arg3') );
- } else {
- um_admin_new_modal( modal_id );
- }
-
- return false;
-
- });
-
-
-
- /**
- submit font icon
- **/
- jQuery(document.body).on('click', '#UM_fonticons a.um-admin-modal-back:not(.um-admin-modal-cancel)', function(){
- var v_id = '';
- var icon_selected = jQuery(this).attr('data-code');
- if ( icon_selected != '' ) {
- if ( jQuery(this).attr('data-modal') ) {
- v_id = '#' + jQuery(this).attr('data-modal');
- } else {
- v_id = '.postbox';
- }
- jQuery( v_id ).find('input#_icon,input#_um_icon,input#notice__um_icon,input#um_profile_tab__icon').val( icon_selected );
- jQuery( v_id ).find('span.um-admin-icon-value').html('');
- jQuery( v_id ).find('.um-admin-icon-clear').show();
- }
- jQuery(this).attr('data-code', '');
- if ( v_id == '.postbox' ) {
- UM.common.tipsy.hide();
- um_admin_remove_modal();
- }
- });
-
- /**
- restore font icon
- **/
- jQuery(document.body).on('click', 'span.um-admin-icon-clear', function(){
- var element = jQuery(this).parents('p');
- jQuery('#UM_fonticons a.um-admin-modal-back').attr('data-code', '');
- element.find('input[type="hidden"]').val('');
- element.find('.um-admin-icon-value').html( wp.i18n.__( 'No Icon', 'ultimate-member' ) );
-
- element = jQuery(this).parents('td');
- element.find('input[type="hidden"]').val('');
- element.find('.um-admin-icon-value').html( wp.i18n.__( 'No Icon', 'ultimate-member' ) );
- jQuery(this).hide();
- });
-
- /**
- search font icons
- **/
- jQuery(document.body).on('keyup blur', '#_icon_search', function(){
- if ( jQuery(this).val().toLowerCase() !== '' ) {
- jQuery('.um-admin-icons span').hide();
- jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]').show();
- } else {
- jQuery('.um-admin-icons span:hidden').show();
- }
- um_admin_modal_responsive();
- });
-
-}); // end jQuery(document).ready
-
diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php
index d2b4d89c..435e3b94 100644
--- a/includes/admin/class-enqueue.php
+++ b/includes/admin/class-enqueue.php
@@ -15,6 +15,7 @@ final class Enqueue extends \um\common\Enqueue {
/**
* @var string
+ * @deprecated 2.7.1
*/
public $js_url;
@@ -40,11 +41,12 @@ final class Enqueue extends \um\common\Enqueue {
/**
* @var bool
*/
- public $um_cpt_form_screen;
+ private static $um_cpt_form_screen = false;
/**
* @var bool
+ * @deprecated 2.7.1
*/
public $post_page;
@@ -55,14 +57,11 @@ final class Enqueue extends \um\common\Enqueue {
public function __construct() {
parent::__construct();
- $this->js_url = UM_URL . 'includes/admin/assets/js/';
$this->css_url = UM_URL . 'includes/admin/assets/css/';
$this->front_js_baseurl = UM_URL . 'assets/js/';
$this->front_css_baseurl = UM_URL . 'assets/css/';
- $this->um_cpt_form_screen = false;
-
add_filter( 'admin_body_class', array( &$this, 'admin_body_class' ), 999 );
add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
@@ -210,37 +209,6 @@ final class Enqueue extends \um\common\Enqueue {
add_action( 'admin_enqueue_scripts', array( &$this, 'enqueue_navmenu_scripts' ) );
}
- /**
- * @since 2.7.1
- */
- public function posts_page() {
- if ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) {
- add_action( 'admin_enqueue_scripts', array( &$this, 'forms_page_scripts' ) );
- } elseif ( isset( $_GET['post_type'] ) && 'um_directory' === sanitize_key( $_GET['post_type'] ) ) {
- add_action( 'admin_enqueue_scripts', array( &$this, 'directories_page_scripts' ) );
- }
- }
-
- /**
- * @since 2.7.1
- */
- public function forms_page_scripts() {
- $suffix = self::get_suffix();
- $css_url = self::get_url( 'css' );
- wp_register_style( 'um_admin_forms-screen', $css_url . 'admin/forms-screen' . $suffix . '.css', array(), UM_VERSION );
- wp_enqueue_style( 'um_admin_forms-screen' );
- }
-
- /**
- * @since 2.7.1
- */
- public function directories_page_scripts() {
- $suffix = self::get_suffix();
- $css_url = self::get_url( 'css' );
- wp_register_style( 'um_admin_directories-screen', $css_url . 'admin/directories-screen' . $suffix . '.css', array(), UM_VERSION );
- wp_enqueue_style( 'um_admin_directories-screen' );
- }
-
/**
* @since 2.7.1
*/
@@ -277,16 +245,36 @@ final class Enqueue extends \um\common\Enqueue {
}
/**
- *
+ * @since 2.7.1
*/
- public function enqueue_cpt_scripts() {
- // phpcs:ignore WordPress.Security.NonceVerification
- if ( ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) || ( isset( $_GET['post'] ) && 'um_form' === get_post_type( absint( $_GET['post'] ) ) ) ) {
- $this->um_cpt_form_screen = true;
- add_action( 'admin_footer', array( $this, 'admin_footer_scripts' ), 20 );
+ public function posts_page() {
+ if ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) {
+ add_action( 'admin_enqueue_scripts', array( &$this, 'forms_page_scripts' ) );
+ } elseif ( isset( $_GET['post_type'] ) && 'um_directory' === sanitize_key( $_GET['post_type'] ) ) {
+ add_action( 'admin_enqueue_scripts', array( &$this, 'directories_page_scripts' ) );
}
}
+ /**
+ * @since 2.7.1
+ */
+ public function forms_page_scripts() {
+ $suffix = self::get_suffix();
+ $css_url = self::get_url( 'css' );
+ wp_register_style( 'um_admin_forms-screen', $css_url . 'admin/forms-screen' . $suffix . '.css', array(), UM_VERSION );
+ wp_enqueue_style( 'um_admin_forms-screen' );
+ }
+
+ /**
+ * @since 2.7.1
+ */
+ public function directories_page_scripts() {
+ $suffix = self::get_suffix();
+ $css_url = self::get_url( 'css' );
+ wp_register_style( 'um_admin_directories-screen', $css_url . 'admin/directories-screen' . $suffix . '.css', array(), UM_VERSION );
+ wp_enqueue_style( 'um_admin_directories-screen' );
+ }
+
/**
* Assets for FRONTEND PREVIEW.
*/
@@ -328,6 +316,7 @@ final class Enqueue extends \um\common\Enqueue {
wp_register_script( 'um_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'um_fileupload' ), UM_VERSION, true );
wp_enqueue_script( 'um_functions' );
+
wp_register_script( 'um_scripts', $this->front_js_baseurl . 'um-scripts' . $suffix . '.js', array( 'um_functions', 'um_crop', 'um_raty', self::$select2_handle, 'um_fileupload', 'um_datetime', 'um_datetime_date', 'um_datetime_time'/*, 'um_datetime_legacy'*/ ), UM_VERSION, true );
wp_register_script( 'um_responsive', $this->front_js_baseurl . 'um-responsive' . $suffix . '.js', array( 'um_scripts', 'um_crop' ), UM_VERSION, true );
wp_register_script( 'um_modal', $this->front_js_baseurl . 'um-modal' . $suffix . '.js', array( 'um_responsive' ), UM_VERSION, true );
@@ -354,29 +343,28 @@ final class Enqueue extends \um\common\Enqueue {
* Load Forms
*/
public function load_forms() {
- $suffix = self::get_suffix();
+ $suffix = self::get_suffix();
+ $js_url = self::get_url( 'js' );
+ $css_url = self::get_url( 'css' );
- wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery', 'wp-i18n', self::$select2_handle, 'jquery-ui-draggable', 'jquery-ui-sortable' ), UM_VERSION, true );
+ wp_register_script( 'um_admin_forms', $js_url . 'admin/forms' . $suffix . '.js', array( 'um_admin_common', self::$select2_handle, 'jquery-ui-draggable', 'jquery-ui-sortable', 'jquery-ui-slider' ), UM_VERSION, true );
- wp_localize_script(
- 'um_admin_forms',
- 'um_forms_data',
- array(
- 'successfully_redirect' => add_query_arg(
- array(
- 'page' => 'um_options',
- 'tab' => 'misc',
- 'msg' => 'updated',
- ),
- admin_url( 'admin.php' )
+ $forms_data = array(
+ 'successfully_redirect' => add_query_arg(
+ array(
+ 'page' => 'um_options',
+ 'tab' => 'misc',
+ 'msg' => 'updated',
),
- 'md_sorting_data_types' => UM()->member_directory()->sort_data_types,
- )
+ admin_url( 'admin.php' )
+ ),
);
+ $forms_data = apply_filters( 'um_admin_forms_data_localize', $forms_data );
+ wp_localize_script( 'um_admin_forms', 'um_forms_data', $forms_data );
wp_enqueue_script( 'um_admin_forms' );
- wp_register_style( 'um_admin_forms', $this->css_url . 'um-admin-forms.css', array( 'wp-color-picker', 'um_ui', 'select2' ), UM_VERSION );
+ wp_register_style( 'um_admin_forms', $css_url . 'admin/forms' . $suffix . '.css', array( 'wp-color-picker', 'um_ui', 'select2' ), UM_VERSION );
wp_enqueue_style( 'um_admin_forms' );
}
@@ -388,10 +376,10 @@ final class Enqueue extends \um\common\Enqueue {
$js_url = self::get_url( 'js' );
$css_url = self::get_url( 'css' );
- wp_register_script( 'um_admin_modal', $js_url . 'admin/modal' . $suffix . '.js', array( 'jquery', 'editor', 'wp-util', 'wp-color-picker', 'wp-tinymce', 'wp-i18n', 'um_admin_common' ), UM_VERSION, true );
+ wp_register_script( 'um_admin_modal', $js_url . 'admin/modal' . $suffix . '.js', array( 'um_admin_common' ), UM_VERSION, true );
wp_enqueue_script( 'um_admin_modal' );
- wp_register_style( 'um_admin_modal', $css_url . 'admin/modal' . $suffix . '.css', array( 'wp-color-picker' ), UM_VERSION );
+ wp_register_style( 'um_admin_modal', $css_url . 'admin/modal' . $suffix . '.css', array( 'um_admin_common' ), UM_VERSION );
wp_enqueue_style( 'um_admin_modal' );
}
@@ -405,10 +393,10 @@ final class Enqueue extends \um\common\Enqueue {
$js_url = self::get_url( 'js' );
$css_url = self::get_url( 'css' );
- wp_register_script( 'um_admin_builder', $js_url . 'admin/builder' . $suffix . '.js', array( 'um_common', 'jquery-ui-draggable', 'jquery-ui-sortable' ), UM_VERSION, true );
+ wp_register_script( 'um_admin_builder', $js_url . 'admin/builder' . $suffix . '.js', array( 'um_admin_modal', 'jquery-ui-draggable', 'jquery-ui-sortable', 'editor', 'wp-tinymce' ), UM_VERSION, true );
wp_enqueue_script( 'um_admin_builder' );
- wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_ui' ), UM_VERSION );
+ wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_admin_modal' ), UM_VERSION );
wp_enqueue_style( 'um_admin_builder' );
}
@@ -528,13 +516,13 @@ final class Enqueue extends \um\common\Enqueue {
$this->load_global_scripts();
if ( UM()->admin()->screen()->is_own_screen() ) {
- wp_register_script( 'um_admin_common', $js_url . 'admin/common' . $suffix . '.js', array( 'jquery', 'wp-i18n', 'wp-color-picker', 'jquery-ui-tooltip', 'um_common', 'um_datetime', 'um_datetime_date', 'um_datetime_time' ), UM_VERSION, true );
+ wp_register_script( 'um_admin_common', $js_url . 'admin/common' . $suffix . '.js', array( 'wp-color-picker', 'jquery-ui-tooltip', 'um_common' ), UM_VERSION, true );
wp_enqueue_script( 'um_admin_common' );
- wp_register_style( 'um_admin_common', $css_url . 'admin/common' . $suffix . '.css', array( 'um_common', 'um_ui', 'dashicons', 'um_datetime_date', 'um_datetime_time' ), UM_VERSION );
+ wp_register_style( 'um_admin_common', $css_url . 'admin/common' . $suffix . '.css', array( 'um_common', 'um_ui', 'dashicons' ), UM_VERSION );
wp_enqueue_style( 'um_admin_common' );
- if ( $this->um_cpt_form_screen ) {
+ if ( self::$um_cpt_form_screen ) {
$this->load_builder();
$this->load_modal();
}
@@ -581,6 +569,18 @@ final class Enqueue extends \um\common\Enqueue {
}
}
+ /**
+ *
+ */
+ public function enqueue_cpt_scripts() {
+ if ( ( isset( $_GET['post_type'] ) && 'um_form' === sanitize_key( $_GET['post_type'] ) ) || ( isset( $_GET['post'] ) && 'um_form' === get_post_type( absint( $_GET['post'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+ self::$um_cpt_form_screen = true;
+ add_action( 'admin_footer', array( $this, 'admin_footer_scripts' ), 20 );
+ } elseif ( ( isset( $_GET['post_type'] ) && 'um_directory' === sanitize_key( $_GET['post_type'] ) ) || ( isset( $_GET['post'] ) && 'um_directory' === get_post_type( absint( $_GET['post'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
+ add_filter( 'um_admin_forms_data_localize', array( &$this, 'directory_forms_data_localize' ) );
+ }
+ }
+
/**
* Print editor scripts if they are not printed by default
*/
@@ -608,4 +608,15 @@ final class Enqueue extends \um\common\Enqueue {
$class::enqueue_scripts();
$class::editor_js();
}
+
+ /**
+ * @since 2.7.1
+ * @param array $form_data
+ *
+ * @return array
+ */
+ public function directory_forms_data_localize( $form_data ) {
+ $form_data['md_sorting_data_types'] = UM()->member_directory()->sort_data_types;
+ return $form_data;
+ }
}
diff --git a/includes/common/class-enqueue.php b/includes/common/class-enqueue.php
index ca321edf..e9dc92a1 100644
--- a/includes/common/class-enqueue.php
+++ b/includes/common/class-enqueue.php
@@ -144,7 +144,7 @@ class Enqueue {
wp_register_style( 'um_datetime_date', $libs_url . 'pickadate/default.date' . $suffix . '.css', array( 'um_datetime' ), UM_VERSION );
wp_register_style( 'um_datetime_time', $libs_url . 'pickadate/default.time' . $suffix . '.css', array( 'um_datetime' ), UM_VERSION );
- wp_register_script( 'um_common', $js_url . 'common' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-hooks', 'um_tipsy' ), UM_VERSION, true );
+ wp_register_script( 'um_common', $js_url . 'common' . $suffix . '.js', array( 'jquery', 'wp-util', 'wp-hooks', 'wp-i18n', 'um_tipsy', 'um_datetime_date', 'um_datetime_time' ), UM_VERSION, true );
$um_common_variables = array(
'locale' => get_locale(),
);
@@ -168,6 +168,6 @@ class Enqueue {
$um_common_variables = apply_filters( 'um_common_js_variables', $um_common_variables );
wp_localize_script( 'um_common', 'um_common_variables', $um_common_variables );
- wp_register_style( 'um_common', $css_url . 'common' . $suffix . '.css', array( 'um_tipsy' ), UM_VERSION );
+ wp_register_style( 'um_common', $css_url . 'common' . $suffix . '.css', array( 'um_tipsy', 'um_datetime_date', 'um_datetime_time' ), UM_VERSION );
}
}
diff --git a/includes/frontend/class-enqueue.php b/includes/frontend/class-enqueue.php
index 1836b005..cbb61cf1 100644
--- a/includes/frontend/class-enqueue.php
+++ b/includes/frontend/class-enqueue.php
@@ -74,6 +74,7 @@ final class Enqueue extends \um\common\Enqueue {
$suffix = self::get_suffix();
$libs_url = self::get_url( 'libs' );
$js_url = self::get_url( 'js' );
+ $css_url = self::get_url( 'css' );
// Cropper.js
wp_register_script( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.js', array( 'jquery' ), '1.6.1', true );
@@ -101,8 +102,10 @@ final class Enqueue extends \um\common\Enqueue {
$um_common_variables = apply_filters( 'um_frontend_common_js_variables', $um_common_variables );
wp_localize_script( 'um_frontend_common', 'um_frontend_common_variables', $um_common_variables );
+ // uploadFiles scripts + UM custom styles for uploader.
wp_register_script( 'um_jquery_form', $libs_url . 'jquery-form/jquery-form' . $suffix . '.js', array( 'jquery' ), UM_VERSION, true );
wp_register_script( 'um_fileupload', $libs_url . 'fileupload/fileupload.js', array( 'jquery', 'um_jquery_form' ), UM_VERSION, true );
+ wp_register_style( 'um_fileupload', $css_url . 'um-fileupload' . $suffix . '.css', array(), UM_VERSION );
wp_register_script( 'um_functions', $js_url . 'um-functions' . $suffix . '.js', array( 'um_frontend_common', 'um_fileupload' ), UM_VERSION, true );
@@ -153,24 +156,19 @@ final class Enqueue extends \um\common\Enqueue {
$account_deps = apply_filters( 'um_account_scripts_dependencies', array( 'jquery', 'wp-hooks' ) );
wp_register_script('um_account', $this->js_baseurl . 'um-account' . $suffix . '.js', $account_deps, UM_VERSION, true );
-
- wp_register_script( 'um_gchart', 'https://www.google.com/jsapi', array(), UM_VERSION, true );
}
-
/**
* Register styles
*/
public function register_styles() {
//FontAwesome and FontIcons styles
- wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), UM_VERSION );
-
wp_register_style( 'um_rtl', $this->css_baseurl . 'um.rtl.css', array(), UM_VERSION );
wp_register_style( 'um_default_css', $this->css_baseurl . 'um-old-default.css', array(), UM_VERSION );
wp_register_style( 'um_modal', $this->css_baseurl . 'um-modal.css', array(), UM_VERSION );
wp_register_style( 'um_responsive', $this->css_baseurl . 'um-responsive.css', array( 'um_profile' ), UM_VERSION );
- wp_register_style( 'um_styles', $this->css_baseurl . 'um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2' ), UM_VERSION );
+ wp_register_style( 'um_styles', $this->css_baseurl . 'um-styles.css', array( 'um_ui', 'um_tipsy', 'um_raty', 'um_fonticons_ii', 'um_fonticons_fa', 'select2', 'um_fileupload' ), UM_VERSION );
wp_register_style( 'um_members', $this->css_baseurl . 'um-members.css', array( 'um_styles' ), UM_VERSION );
if ( is_rtl() ) {
@@ -228,9 +226,6 @@ final class Enqueue extends \um\common\Enqueue {
*/
function load_original() {
- //maybe deprecated
- //$this->load_google_charts();
-
// $this->load_selectjs();
$this->load_modal();
@@ -239,8 +234,6 @@ final class Enqueue extends \um\common\Enqueue {
$this->load_fileupload();
- $this->load_datetimepicker();
-
$this->load_functions();
$this->load_responsive();
@@ -249,15 +242,13 @@ final class Enqueue extends \um\common\Enqueue {
}
-
/**
* Include Google charts
+ * @depecated 2.7.1
*/
function load_google_charts() {
- wp_enqueue_script( 'um_gchart' );
}
-
/**
* Load plugin css
*/
@@ -284,10 +275,9 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load fileupload JS
+ * @depecated 2.7.1
*/
function load_fileupload() {
- wp_enqueue_script( 'um_fileupload' );
- wp_enqueue_style( 'um_fileupload' );
}
@@ -314,25 +304,11 @@ final class Enqueue extends \um\common\Enqueue {
/**
* Load date & time picker
+ * @depecated 2.7.1
*/
function load_datetimepicker() {
- wp_enqueue_script( 'um_datetime' );
- wp_enqueue_script( 'um_datetime_date' );
- wp_enqueue_script( 'um_datetime_time' );
- //wp_enqueue_script( 'um_datetime_legacy' );
-
- // load a localized version for date/time
- $locale = get_locale();
- if ( $locale && ( file_exists( WP_LANG_DIR . '/plugins/ultimate-member/assets/js/pickadate/' . $locale . '.js' ) || file_exists( UM_PATH . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) ) {
- wp_enqueue_script('um_datetime_locale' );
- }
-
- wp_enqueue_style( 'um_datetime' );
- wp_enqueue_style( 'um_datetime_date' );
- wp_enqueue_style( 'um_datetime_time' );
}
-
/**
* Load scrollbar
* @depecated 2.7.1