From c65d7169d7e1d81bc38f819b615fee3d6b5c9f51 Mon Sep 17 00:00:00 2001 From: Mykyta Synelnikov Date: Tue, 7 Nov 2023 15:51:58 +0200 Subject: [PATCH] - wp-admin assets refactoring (in process); --- assets/js/admin/builder.js | 94 ++++++++++++++++++++++++++++++- assets/js/admin/builder.min.js | 2 +- assets/js/um-scripts.js | 3 +- includes/admin/class-enqueue.php | 86 +++++++--------------------- includes/common/class-enqueue.php | 2 +- 5 files changed, 116 insertions(+), 71 deletions(-) diff --git a/assets/js/admin/builder.js b/assets/js/admin/builder.js index ce631133..387c1e30 100644 --- a/assets/js/admin/builder.js +++ b/assets/js/admin/builder.js @@ -72,9 +72,79 @@ UM.admin.builder = { } }); } + }, + previewResize: function() { + if ( jQuery('.um-admin-modal-body > .um').length ) { + jQuery('.um-admin-modal-body > .um').each(function(){ + + element_width = jQuery(this).width(); + + if ( element_width <= 340 ) { + + jQuery(this).removeClass('uimob340'); + jQuery(this).removeClass('uimob500'); + jQuery(this).removeClass('uimob800'); + jQuery(this).removeClass('uimob960'); + + jQuery(this).addClass('uimob340'); + + } else if ( element_width <= 500 ) { + + jQuery(this).removeClass('uimob340'); + jQuery(this).removeClass('uimob500'); + jQuery(this).removeClass('uimob800'); + jQuery(this).removeClass('uimob960'); + + jQuery(this).addClass('uimob500'); + + } else if ( element_width <= 800 ) { + + jQuery(this).removeClass('uimob340'); + jQuery(this).removeClass('uimob500'); + jQuery(this).removeClass('uimob800'); + jQuery(this).removeClass('uimob960'); + + jQuery(this).addClass('uimob800'); + + } else if ( element_width <= 960 ) { + + jQuery(this).removeClass('uimob340'); + jQuery(this).removeClass('uimob500'); + jQuery(this).removeClass('uimob800'); + jQuery(this).removeClass('uimob960'); + + jQuery(this).addClass('uimob960'); + + } else if ( element_width > 960 ) { + + jQuery(this).removeClass('uimob340'); + jQuery(this).removeClass('uimob500'); + jQuery(this).removeClass('uimob800'); + jQuery(this).removeClass('uimob960'); + + } + + jQuery(this).css('opacity',1); + }); + + jQuery('.um-admin-modal-body .um-cover, .um-admin-modal-body .um-cover-e').each(function(){ + var elem = jQuery(this); + var ratio = elem.data('ratio'); + var width = elem.width(); + var ratios = ratio.split(':'); + + calcHeight = Math.round( width / ratios[0] ) + 'px'; + elem.height( calcHeight ); + elem.find('.um-cover-add').height( calcHeight ); + }); + } } } +jQuery(window).on( 'resize', function() { + UM.admin.builder.previewResize(); +}); + wp.hooks.addAction( 'um_admin_modal_success_result', 'um_admin_builder', function( $adminModal, act_id ) { UM.admin.builder.fieldConditions.refresh(); @@ -91,6 +161,26 @@ wp.hooks.addAction( 'um_admin_modal_success_result', 'um_admin_builder', functio } if ( 'um_admin_preview_form' === act_id ) { + // Make responsive script only when live preview. + UM.admin.builder.previewResize(); + + if ( typeof( jQuery.fn.um_raty ) === 'function' ) { + jQuery('.um-rating').um_raty({ + half: false, + starType: 'i', + number: function() { + return jQuery(this).attr('data-number'); + }, + score: function() { + return jQuery(this).attr('data-score'); + }, + scoreName: function() { + return jQuery(this).attr('data-key'); + }, + hints: false, + }); + } + // Fix for overlay in scrollable preview modal. let $previewOverlay = jQuery('.um-admin-preview-overlay'); $previewOverlay.css('height', $previewOverlay.siblings('.um').outerHeight(true)*1 + 20 + 'px' ); @@ -102,13 +192,13 @@ wp.hooks.addAction( 'um_admin_modal_success_result', 'um_admin_builder', functio wp.hooks.addAction( 'um_admin_modal_resize', 'um_admin_builder', function() { if ( jQuery('#UM_preview_form .um-s1').length ) { - jQuery("#UM_preview_form .um-s1").select2({ + jQuery("#UM_preview_form .um-s1").css({'display':'block'}).select2({ allowClear: true }); } if ( jQuery('#UM_preview_form .um-s2').length ) { - jQuery("#UM_preview_form .um-s2").select2({ + jQuery("#UM_preview_form .um-s2").css({'display':'block'}).select2({ allowClear: false, minimumResultsForSearch: 10 }); diff --git a/assets/js/admin/builder.min.js b/assets/js/admin/builder.min.js index ec18e9ca..4114bed9 100644 --- a/assets/js/admin/builder.min.js +++ b/assets/js/admin/builder.min.js @@ -1 +1 @@ -function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(i,e){jQuery("#publish").attr("disabled","disabled"),e.item.hasClass("um-field-type-group")&&0')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var e,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append(''),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var i=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(this).attr("data-original","_um_row_"+d)}),e=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var i;jQuery(this).hasClass("group")||(""!=(i=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+i).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('')):jQuery(".um_update_order_fields").append('')),e++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append('')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var i='';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(i)})}function um_builder_delete_field_ajax(e){var i,d;0").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()),d=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(d),tinyMCE.get(e).setContent(i),a):(UM.admin.builder.tinyMCE.editor=jQuery("
").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');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()}); \ No newline at end of file +function UM_Drag_and_Drop(){jQuery(".um-admin-drag-col,.um-admin-drag-group").sortable({items:".um-admin-drag-fld",connectWith:".um-admin-drag-col,.um-admin-drag-group",placeholder:"um-fld-placeholder",forcePlaceholderSize:!0,update:function(e,i){jQuery("#publish").attr("disabled","disabled"),i.item.hasClass("um-field-type-group")&&0')})}function UM_update_subrows(){jQuery('a[data-remove_element="um-admin-drag-rowsub"]').remove(),jQuery(".um-admin-drag-row").each(function(){c=0,jQuery(this).find(".um-admin-drag-rowsub").each(function(){c++,row=jQuery(this),1!=c&&row.find(".um-admin-drag-rowsub-icons").append('')})})}function UM_Change_Field_Col(){jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){cols=jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col").length,(col=jQuery(this).parents(".um-admin-drag-col")).hasClass("cols-last")?(1==cols&&(saved_col=1),3==cols?saved_col=3:2==cols&&(saved_col=2)):saved_col=col.hasClass("cols-middle")&&3==cols?2:1,jQuery(this).data("column",saved_col)})}function UM_Change_Field_Grp(){jQuery(".um-admin-drag-col .um-admin-drag-fld:not(.um-field-type-group)").each(function(){0==jQuery(this).parents(".um-admin-drag-group").length?jQuery(this).data("group",""):jQuery(this).data("group",jQuery(this).parents(".um-admin-drag-fld.um-field-type-group").data("key"))})}function UM_Rows_Refresh(){jQuery(".um_update_order_fields").empty();var i,d=0;jQuery(".um-admin-drag-row").each(function(){d++,row=jQuery(this),col_num="",row.find(".um-admin-drag-rowsub").each(function(){(subrow=jQuery(this)).find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),subrow.find(".um-admin-drag-col").addClass("cols-"+subrow.find(".um-admin-drag-col").length),subrow.find(".um-admin-drag-col:last").addClass("cols-last"),3==subrow.find(".um-admin-drag-col").length&&subrow.find(".um-admin-drag-col:eq(1)").addClass("cols-middle"),col_num=col_num?col_num+":"+subrow.find(".um-admin-drag-col").length:subrow.find(".um-admin-drag-col").length}),jQuery(".um_update_order_fields").append(''),sub_rows_count=row.find(".um-admin-drag-rowsub").length;var e=jQuery(this).attr("data-original");jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(this).attr("data-original","_um_row_"+d)}),i=0,jQuery(".um-admin-drag-col .um-admin-drag-fld").each(function(){var e;jQuery(this).hasClass("group")||(""!=(e=jQuery(this).data("group"))?(0==jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group").find(jQuery(this)).length&&jQuery(this).appendTo(jQuery(".um-admin-drag-fld.um-field-type-group."+e).find(".um-admin-drag-group")),jQuery(".um_update_order_fields").append('')):jQuery(".um_update_order_fields").append('')),i++,row="_um_row_"+(row=jQuery(this).parents(".um-admin-drag-row").index()+1),3==(saved_col=jQuery(this).data("column"))&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(2)")),2==saved_col&&jQuery(this).appendTo(jQuery(this).parents(".um-admin-drag-rowsub").find(".um-admin-drag-col:eq(1)")),sub_row=jQuery(this).parents(".um-admin-drag-rowsub").index(),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append(''),jQuery(".um_update_order_fields").append('')}),UM_Drag_and_Drop(),UM_Add_Icon(),jQuery.ajax({url:wp.ajax.settings.url,type:"POST",data:jQuery(".um_update_order").serialize(),success:function(){jQuery("#publish").prop("disabled",!1)}})}function UM_Add_Icon(){var e='';jQuery(".um-admin-drag-col").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)}),jQuery(".um-admin-drag-group").each(function(){0==jQuery(this).find(".um-admin-drag-add-field").length||jQuery(this).find(".um-admin-drag-add-field").remove(),jQuery(this).append(e)})}function um_builder_delete_field_ajax(i){var e,d;0").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),d=void 0===tinyMCEPreInit.mceInit[i]?tinyMCEPreInit.mceInit[i]=tinyMCE.extend({},tinyMCEPreInit.mceInit[i]):tinyMCEPreInit.mceInit[i],"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),"object"==typeof window.switchEditors&&window.switchEditors.go(i),tinyMCE.init(d),tinyMCE.get(i).setContent(e),a):(UM.admin.builder.tinyMCE.editor=jQuery("
").append(a.parents("#wp-"+i+"-wrap").clone()),a.parents("#wp-"+i+"-wrap").replaceWith('
'),jQuery(".um-admin-editor:visible").html(jQuery(UM.admin.builder.tinyMCE.editor).html()),"function"==typeof QTags&&(QTags(tinyMCEPreInit.qtInit[i]),QTags._buttonsInit()),jQuery("#"+i))).html(e),jQuery("body").on("click",".wp-switch-editor",function(){var e=jQuery(this);e.hasClass("wp-switch-editor")&&"object"==typeof window.switchEditors&&(e=e.hasClass("switch-tmce")?"tmce":"html",window.switchEditors.go(i,e))})}},previewResize:function(){jQuery(".um-admin-modal-body > .um").length&&(jQuery(".um-admin-modal-body > .um").each(function(){(element_width=jQuery(this).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'+jQuery(".um-col-demon-row").html()+"
"),e.find(".um-admin-drag-row:last").find(".um-admin-drag-row-icons").find("a.um-admin-drag-row-edit").attr("data-arg3","_um_row_"+e.find(".um-admin-drag-row").length),e.find(".um-admin-drag-row:last").attr("data-original","_um_row_"+e.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 e=jQuery(this),i=jQuery(this).data("remove_element"),d=jQuery(this).parents("."+i).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(e){if(r.row===UM.admin.builder.deleteProcess[e].row&&r.subrow===UM.admin.builder.deleteProcess[e].subrow)return!(o=!0)}),o||(d.show(),UM.admin.builder.deleteProcess.push({row:a,subrow:n}),UM.admin.builder.fieldsToDelete=jQuery(this).parents("."+i).find(".um-admin-drag-fld").toArray(),0');e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col").length),e.find(".um-admin-drag-col:last").addClass("cols-last"),3==e.find(".um-admin-drag-col").length&&e.find(".um-admin-drag-col:eq(1)").addClass("cols-middle")}else n<0&&(2==(n+=3)&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col.cols-last").remove()),1==n&&(e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-last").html()),e.find(".um-admin-drag-col:first").append(e.find(".um-admin-drag-col.cols-middle").html()),e.find(".um-admin-drag-col.cols-last").remove(),e.find(".um-admin-drag-col.cols-middle").remove()),e.find(".um-admin-drag-col").removeClass("cols-1 cols-2 cols-3 cols-last cols-middle"),e.find(".um-admin-drag-col").addClass("cols-"+e.find(".um-admin-drag-col:visible").length),e.find(".um-admin-drag-col:last").addClass("cols-last"));1==allow_update_via_col_click&&(UM_Change_Field_Col(),UM_Rows_Refresh())}),allow_update_via_col_click=!1,jQuery(".um-admin-drag-ctrls.columns a.active").each(function(){jQuery(this).trigger("click")}).promise().done(function(){allow_update_via_col_click=!0}),UM_Rows_Refresh()}); \ No newline at end of file diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js index 922f8917..51927056 100644 --- a/assets/js/um-scripts.js +++ b/assets/js/um-scripts.js @@ -281,6 +281,7 @@ jQuery(document).ready(function() { wp.ajax.send( 'um_remove_file', args ); }); + // @todo deprecate jQuery(document).on('click', '.um-field-group-head:not(.disabled)', function() { var field = jQuery(this).parents('.um-field-group'); var limit = field.data('max_entries'); @@ -308,7 +309,7 @@ jQuery(document).ready(function() { } }); - + // @todo deprecate jQuery(document).on('click', '.um-field-group-cancel', function( e ) { e.preventDefault(); var field = jQuery(this).parents('.um-field-group'); diff --git a/includes/admin/class-enqueue.php b/includes/admin/class-enqueue.php index 7ac5b1fd..23aba0f3 100644 --- a/includes/admin/class-enqueue.php +++ b/includes/admin/class-enqueue.php @@ -275,70 +275,6 @@ final class Enqueue extends \um\common\Enqueue { wp_enqueue_style( 'um_admin_directories-screen' ); } - /** - * Assets for FRONTEND PREVIEW. - */ - public function enqueue_frontend_preview_assets() { - $suffix = self::get_suffix(); - $js_url = self::get_url( 'js' ); - $css_url = self::get_url( 'css' ); - $libs_url = self::get_url( 'libs' ); - - // Cropper.js - wp_register_script( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.js', array( 'jquery' ), '1.6.1', true ); - wp_register_style( 'um_crop', $libs_url . 'cropper/cropper' . $suffix . '.css', array(), '1.6.1' ); - - wp_register_script( 'um_frontend_common', $js_url . 'common-frontend' . $suffix . '.js', array( 'um_common', 'um_crop' ), UM_VERSION, true ); - $um_common_variables = array(); - /** - * Filters data array for localize frontend common scripts. - * - * @since 2.7.1 - * @hook um_frontend_common_js_variables - * - * @param {array} $variables Data to localize. - * - * @return {array} Data to localize. - * - * @example Add `my_custom_variable` to common frontend scripts to be callable via `um_frontend_common_variables.my_custom_variable` in JS. - * function um_custom_frontend_common_js_variables( $variables ) { - * $variables['{my_custom_variable}'] = '{my_custom_variable_value}'; - * return $variables; - * } - * add_filter( 'um_frontend_common_js_variables', 'um_custom_frontend_common_js_variables' ); - */ - $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 ); - - 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_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 ); - - wp_register_style( 'um_responsive', $this->front_css_baseurl . 'um-responsive.css', array(), UM_VERSION ); - wp_register_style( 'um_modal', $this->front_css_baseurl . 'um-modal.css', array(), UM_VERSION ); - wp_register_style( 'um_styles', $this->front_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_members', $this->front_css_baseurl . 'um-members.css', array(), UM_VERSION ); - wp_register_style( 'um_profile', $this->front_css_baseurl . 'um-profile.css', array(), UM_VERSION ); - wp_register_style( 'um_account', $this->front_css_baseurl . 'um-account.css', array(), UM_VERSION ); - wp_register_style( 'um_misc', $this->front_css_baseurl . 'um-misc.css', array(), UM_VERSION ); - wp_register_style( 'um_default_css', $this->front_css_baseurl . 'um-old-default.css', array( 'um_crop', 'um_tipsy', 'um_raty', 'um_responsive', 'um_modal', 'um_styles', 'um_members', 'um_profile', 'um_account', 'um_misc', 'um_datetime_date', 'um_datetime_time', 'select2' ), UM_VERSION ); - - // Scripts for frontend preview. - UM()->frontend()->enqueue()->load_css(); - UM()->frontend()->enqueue()->load_modal(); - UM()->frontend()->enqueue()->load_responsive(); - - wp_enqueue_script( 'um_modal' ); - wp_enqueue_style( 'um_default_css' ); - } - /** * Load Forms */ @@ -398,10 +334,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_admin_modal', 'jquery-ui-draggable', 'jquery-ui-sortable', 'editor', 'wp-tinymce', self::$select2_handle ), 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', self::$select2_handle, 'um_raty' ), UM_VERSION, true ); wp_enqueue_script( 'um_admin_builder' ); - wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_admin_modal', 'select2' ), UM_VERSION ); + wp_register_style( 'um_admin_builder', $css_url . 'admin/builder' . $suffix . '.css', array( 'um_admin_modal', 'select2', 'um_raty' ), UM_VERSION ); // RTL styles. if ( is_rtl() ) { wp_style_add_data( 'um_admin_builder', 'rtl', true ); @@ -410,6 +346,24 @@ final class Enqueue extends \um\common\Enqueue { wp_enqueue_style( 'um_admin_builder' ); } + /** + * Assets for FRONTEND PREVIEW. + */ + private function enqueue_frontend_preview_assets() { + $suffix = self::get_suffix(); + $css_url = self::get_url( 'css' ); + + wp_register_style( 'um_fileupload', $css_url . 'um-fileupload' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_responsive', $css_url . 'um-responsive' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_styles', $css_url . 'um-styles' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_profile', $css_url . 'um-profile' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_misc', $css_url . 'um-misc' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_modal', $css_url . 'um-modal' . $suffix . '.css', array(), UM_VERSION ); + wp_register_style( 'um_default_css', $css_url . 'um-old-default' . $suffix . '.css', array( 'um_fileupload', 'um_responsive', 'um_modal', 'um_styles', 'um_profile', 'um_misc' ), UM_VERSION ); + + wp_enqueue_style( 'um_default_css' ); + } + /** * Load global css */ diff --git a/includes/common/class-enqueue.php b/includes/common/class-enqueue.php index e9dc92a1..df1c0e44 100644 --- a/includes/common/class-enqueue.php +++ b/includes/common/class-enqueue.php @@ -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_datetime_date', 'um_datetime_time' ), UM_VERSION ); + wp_register_style( 'um_common', $css_url . 'common' . $suffix . '.css', array( 'um_tipsy', 'um_datetime_date', 'um_datetime_time', 'um_fonticons_ii', 'um_fonticons_fa' ), UM_VERSION ); } }