diff --git a/assets/js/um-functions.js b/assets/js/um-functions.js index b5b38959..85dde497 100644 --- a/assets/js/um-functions.js +++ b/assets/js/um-functions.js @@ -253,8 +253,7 @@ function UM_domenus(){ } function um_responsive(){ - - // responsive um shortcode + jQuery('.um').each(function(){ element_width = jQuery(this).width(); @@ -303,18 +302,15 @@ function um_responsive(){ jQuery(this).removeClass('uimob960'); } - - // account nav + if ( jQuery('.um-account-nav').length > 0 && jQuery('.um-account-side').is(':visible') && jQuery('.um-account-tab:visible').length == 0 ) { jQuery('.um-account-side li a.current').trigger('click'); } - - // show + jQuery(this).css('opacity',1); }); - - // responsive cover + jQuery('.um-cover, .um-member-cover').each(function(){ var elem = jQuery(this); @@ -327,13 +323,11 @@ function um_responsive(){ elem.find('.um-cover-add').height( calcHeight ); }); - - // members directory + jQuery('.um-members').each(function(){ UM_Member_Grid( jQuery(this) ); }); - // menus UM_domenus(); } @@ -512,7 +506,6 @@ function initFileUpload_UM( trigger ) { function initCrop_UM() { - // only when a crop image is in view var target_img = jQuery('.um-modal:visible .um-single-image-preview img'); var target_img_parent = jQuery('.um-modal:visible .um-single-image-preview'); @@ -521,7 +514,6 @@ function initCrop_UM() { var min_height = target_img.parent().attr('data-min_height'); var ratio = target_img.parent().attr('data-ratio'); - // custom defined ratio maybe if ( jQuery('.um-modal').find('#um_upload_single').attr('data-ratio') ) { var ratio = jQuery('.um-modal').find('#um_upload_single').attr('data-ratio'); var ratio_split = ratio.split(':'); @@ -545,46 +537,48 @@ function initCrop_UM() { if ( crop_data == 'square' ) { - var opts = { - minWidth: min_width, - minHeight: min_height, - dragCrop: false, - aspectRatio: 1.0, - zoomable: false, - rotatable: false, - dashed: false, - done: function(data) { - target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); - } - }; + var opts = { + minWidth: min_width, + minHeight: min_height, + dragCrop: false, + aspectRatio: 1.0, + zoomable: false, + rotatable: false, + dashed: false, + done: function(data) { + target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); + } + }; } else if ( crop_data == 'cover' ) { - var opts = { - minWidth: min_width, - minHeight: Math.round( min_width / ratio ), - dragCrop: false, - aspectRatio: ratio, - zoomable: false, - rotatable: false, - dashed: false, - done: function(data) { - target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); - } - }; + var opts = { + minWidth: min_width, + minHeight: Math.round( min_width / ratio ), + dragCrop: false, + aspectRatio: ratio, + zoomable: false, + rotatable: false, + dashed: false, + done: function(data) { + target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); + } + }; } else if ( crop_data == 'user' ) { - var opts = { - dragCrop: true, - aspectRatio: "auto", - zoomable: false, - rotatable: false, - dashed: false, - done: function(data) { - target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); - } - }; + var opts = { + minWidth: min_width, + minHeight: min_height, + dragCrop: true, + aspectRatio: "auto", + zoomable: false, + rotatable: false, + dashed: false, + done: function(data) { + target_img.parent().attr('data-coord', Math.round(data.x) + ',' + Math.round(data.y) + ',' + Math.round(data.width) + ',' + Math.round(data.height) ); + } + }; } @@ -601,7 +595,7 @@ function um_new_modal( id, size, isPhoto, source ){ var modal = jQuery('body').find('.um-modal-overlay'); - if ( modal.length == 0 ) { // when new Modal is fired + if ( modal.length == 0 ) { jQuery('.tipsy').hide(); @@ -663,7 +657,7 @@ function um_new_modal( id, size, isPhoto, source ){ } - } // when new Modal is fired + } } diff --git a/assets/js/um.min.js b/assets/js/um.min.js index 88ee26bb..b6d103e9 100644 --- a/assets/js/um.min.js +++ b/assets/js/um.min.js @@ -111,7 +111,7 @@ this.data("tipsy");if(f)f[a]();return this}a=b.extend({},b.fn.tipsy.defaults,a); b.data(this,"tipsy-pointee"),c;if(!(c=!a)){a:{for(;a=a.parentNode;)if(a==document){a=true;break a}a=false}c=!a}c&&b(this).remove()})};b.fn.tipsy.elementOptions=function(a,c){return b.metadata?b.extend({},c,b(a).metadata()):c};b.fn.tipsy.autoNS=function(){return b(this).offset().top>b(document).scrollTop()+b(window).height()/2?"s":"n"};b.fn.tipsy.autoWE=function(){return b(this).offset().left>b(document).scrollLeft()+b(window).width()/2?"e":"w"};b.fn.tipsy.autoBounds=function(a,c){return function(){var d= {ns:c[0],ew:c.length>1?c[1]:false},h=b(document).scrollTop()+a,f=b(document).scrollLeft()+a,g=b(this);if(g.offset().topparseInt(value0)){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'less than'){if(jQuery.isNumeric(value0) && parseInt(live_value) < parseInt(value0) && live_value){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'contains'){if(live_value.indexOf(value0)>= 0){jQuery(this).fadeIn()}else{jQuery(this).hide()}}}if(action0 == 'hide' && field0 == live_field){if(operator0 == 'empty'){if(live_value == ''){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'not empty'){if(live_value!= ''){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'equals to'){if(value0 == live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'not equals'){if(jQuery.isNumeric(value0) && parseInt(live_value)!= parseInt(value0) && live_value){jQuery(this).hide()}else if(!jQuery.isNumeric(value0) && value0!= live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'greater than'){if(jQuery.isNumeric(value0) && parseInt(live_value)>parseInt(value0)){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'less than'){if(jQuery.isNumeric(value0) && parseInt(live_value) < parseInt(value0) && live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'contains'){if(live_value.indexOf(value0)>= 0){jQuery(this).hide()}else{jQuery(this).fadeIn()}}}}})}function UM_hide_menus(){menu = jQuery('.um-dropdown');menu.parents('div').find('a').removeClass('active');menu.hide()}function UM_domenus(){jQuery('.um-dropdown').each(function(){var menu = jQuery(this);var element = jQuery(this).attr('data-element');var position = jQuery(this).attr('data-position');jQuery(element).addClass('um-trigger-menu-on-'+menu.attr('data-trigger'));if(jQuery(window).width() <= 1200 && element == 'div.um-profile-edit'){position = 'lc'}if(position == 'lc'){if(200>jQuery(element).find('img').width()){left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)+((jQuery(element).find('img').width() - 200) / 2)}else{left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)}top_ = parseInt(jQuery(element).find('a').css('top'));if(top_){top_p = jQuery(element).find('img').height()+4+top_;left_gap = 4}else{top_p = jQuery(element).find('img').height()+4;left_gap = 0}if(top_p == 4 && element == 'div.um-cover'){top_p = jQuery(element).height() / 2+(menu.height() / 2)}else if(top_p == 4){top_p = jQuery(element).height()+20}gap_right = jQuery(element).width()+17;menu.css({'top':0,'width':200,'left':'auto','right':gap_right+'px','text-align':'center'});menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-right-b');menu.find('.um-dropdown-arr').css({'top':'4px','left':'auto','right':'-17px'})}if(position == 'bc'){if(200>jQuery(element).find('img').width()){left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)+((jQuery(element).find('img').width() - 200) / 2)}else{left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)}top_ = parseInt(jQuery(element).find('a').css('top'));if(top_){top_p = jQuery(element).find('img').height()+4+top_;left_gap = 4}else{top_p = jQuery(element).find('img').height()+4;left_gap = 0}if(top_p == 4 && element == 'div.um-cover'){top_p = jQuery(element).height() / 2+(menu.height() / 2)}else if(top_p == 4){top_p = jQuery(element).height()+20}menu.css({'top':top_p,'width':200,'left':left_p+left_gap,'right':'auto','text-align':'center'});menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-up-b');menu.find('.um-dropdown-arr').css({'top':'-17px','left':(menu.width() / 2) - 12,'right':'auto'})}})}function um_responsive(){jQuery('.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')}if(jQuery('.um-account-nav').length>0 && jQuery('.um-account-side').is(':visible') && jQuery('.um-account-tab:visible').length == 0){jQuery('.um-account-side li a.current').trigger('click')}jQuery(this).css('opacity',1)});jQuery('.um-cover,.um-member-cover').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('.um-members').each(function(){UM_Member_Grid(jQuery(this))});UM_domenus()}function UM_Member_Grid(container){container.masonry({itemSelector:'.um-member',columnWidth:'.um-member',gutter:'.um-gutter-sizer'})}function initImageUpload_UM(trigger){if(trigger.data('upload_help_text')){upload_help_text = ''+trigger.data('upload_help_text')+''}else{upload_help_text = ''}if(trigger.data('icon')){icon = ''}else{icon = ''}if(trigger.data('upload_text')){upload_text = ''+trigger.data('upload_text')+''}else{upload_text = ''}trigger.uploadFile({url:ultimatemember_image_upload_url,method:"POST",multiple:false,formData:{key:trigger.data('key'),set_id:trigger.data('set_id'),set_mode:trigger.data('set_mode')},fileName:trigger.data('key'),allowedTypes:trigger.data('allowed_types'),maxFileSize:trigger.data('max_size'),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:trigger.data('max_size_error'),extErrorStr:trigger.data('extension_error'),maxFileCountErrorStr:trigger.data('max_files_error'),maxFileCount:1,showDelete:false,showAbort:false,showDone:false,showFileCounter:false,showStatusAfterSuccess:true,onSubmit:function(files){trigger.parents('.um-modal-body').find('.um-error-block').remove()},onSuccess:function(files,data,xhr){trigger.selectedFiles = 0;data = jQuery.parseJSON(data);if(data.error && data.error!= ''){trigger.parents('.um-modal-body').append('
'+data.error+'
');trigger.parents('.um-modal-body').find('.upload-statusbar').hide(0);um_modal_responsive()}else{jQuery.each(data,function(key,value){var img_id = trigger.parents('.um-modal-body').find('.um-single-image-preview img');var img_id_h = trigger.parents('.um-modal-body').find('.um-single-image-preview');img_id.attr("src",value);img_id.load(function(){trigger.parents('.um-modal-body').find('.um-modal-btn.um-finish-upload.disabled').removeClass('disabled');trigger.parents('.um-modal-body').find('.ajax-upload-dragdrop,.upload-statusbar').hide(0);img_id_h.show(0);um_modal_responsive()})})}}})}function initFileUpload_UM(trigger){if(trigger.data('upload_help_text')){upload_help_text = ''+trigger.data('upload_help_text')+''}else{upload_help_text = ''}if(trigger.data('icon')){icon = ''}else{icon = ''}if(trigger.data('upload_text')){upload_text = ''+trigger.data('upload_text')+''}else{upload_text = ''}trigger.uploadFile({url:ultimatemember_file_upload_url,method:"POST",multiple:false,formData:{key:trigger.data('key'),set_id:trigger.data('set_id'),set_mode:trigger.data('set_mode')},fileName:trigger.data('key'),allowedTypes:trigger.data('allowed_types'),maxFileSize:trigger.data('max_size'),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:trigger.data('max_size_error'),extErrorStr:trigger.data('extension_error'),maxFileCountErrorStr:trigger.data('max_files_error'),maxFileCount:1,showDelete:false,showAbort:false,showDone:false,showFileCounter:false,showStatusAfterSuccess:true,onSubmit:function(files){trigger.parents('.um-modal-body').find('.um-error-block').remove()},onSuccess:function(files,data,xhr){trigger.selectedFiles = 0;data = jQuery.parseJSON(data);if(data.error && data.error!= ''){trigger.parents('.um-modal-body').append('
'+data.error+'
');trigger.parents('.um-modal-body').find('.upload-statusbar').hide(0);um_modal_responsive()}else{jQuery.each(data,function(key,value){trigger.parents('.um-modal-body').find('.um-modal-btn.um-finish-upload.disabled').removeClass('disabled');trigger.parents('.um-modal-body').find('.ajax-upload-dragdrop,.upload-statusbar').hide(0);trigger.parents('.um-modal-body').find('.um-single-file-preview').show(0);if(key == 'icon'){trigger.parents('.um-modal-body').find('.um-single-fileinfo i').removeClass().addClass(value)}else if(key == 'icon_bg'){trigger.parents('.um-modal-body').find('.um-single-fileinfo span.icon').css({'background-color':value})}else if(key == 'filename'){trigger.parents('.um-modal-body').find('.um-single-fileinfo span.filename').html(value)}else{trigger.parents('.um-modal-body').find('.um-single-fileinfo a').attr('href',value)}});um_modal_responsive()}}})}function initCrop_UM(){var target_img = jQuery('.um-modal:visible .um-single-image-preview img');var target_img_parent = jQuery('.um-modal:visible .um-single-image-preview');var crop_data = target_img.parent().attr('data-crop');var min_width = target_img.parent().attr('data-min_width');var min_height = target_img.parent().attr('data-min_height');var ratio = target_img.parent().attr('data-ratio');if(jQuery('.um-modal').find('#um_upload_single').attr('data-ratio')){var ratio = jQuery('.um-modal').find('#um_upload_single').attr('data-ratio');var ratio_split = ratio.split(':');var ratio = ratio_split[0]}if(target_img.length){if(target_img.attr('src')!= ''){var max_height = jQuery(window).height() -(jQuery('.um-modal-footer a').height()+20) - 50 -(jQuery('.um-modal-header:visible').height());target_img.css({'height':'auto'});target_img_parent.css({'height':'auto'});if(jQuery(window).height() <= 400){target_img_parent.css({'height':max_height+'px','max-height':max_height+'px'});target_img.css({'height':'auto'})}else{target_img.css({'height':'auto','max-height':max_height+'px'});target_img_parent.css({'height':target_img.height(),'max-height':max_height+'px'})}if(crop_data == 'square'){var opts ={minWidth:min_width,minHeight:min_height,dragCrop:false,aspectRatio:1.0,zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}else if(crop_data == 'cover'){var opts ={minWidth:min_width,minHeight:Math.round(min_width / ratio),dragCrop:false,aspectRatio:ratio,zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}else if(crop_data == 'user'){var opts ={dragCrop:true,aspectRatio:"auto",zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}if(crop_data!= 0){target_img.cropper(opts)}}}}function um_new_modal(id,size,isPhoto,source){var modal = jQuery('body').find('.um-modal-overlay');if(modal.length == 0){jQuery('.tipsy').hide();UM_hide_menus();jQuery('body,html,textarea').css("overflow","hidden");jQuery(document).bind("touchmove",function(e){e.preventDefault()});jQuery('.um-modal').on('touchmove',function(e){e.stopPropagation()});if(isPhoto){jQuery('body').append('
')}else{jQuery('body').append('
')}jQuery('#'+id).prependTo('.um-modal');if(isPhoto){jQuery('.um-modal').find('.um-modal-photo').html('');var photo_ = jQuery('.um-modal-photo img');var photo_maxw = jQuery(window).width() - 60;var photo_maxh = jQuery(window).height() -(jQuery(window).height() * .25);photo_.attr("src",source);photo_.load(function(){jQuery('#'+id).show();jQuery('.um-modal').show();photo_.css({'opacity':0});photo_.css({'max-width':photo_maxw});photo_.css({'max-height':photo_maxh});jQuery('.um-modal').css({'width':photo_.width(),'margin-left':'-'+photo_.width() / 2+'px'});photo_.animate({'opacity':1},1000);um_modal_responsive()})}else{jQuery('#'+id).show();jQuery('.um-modal').show();um_modal_size(size);initImageUpload_UM(jQuery('.um-modal:visible').find('.um-single-image-upload'));initFileUpload_UM(jQuery('.um-modal:visible').find('.um-single-file-upload'));um_modal_responsive()}}}function um_modal_responsive(){var modal = jQuery('.um-modal:visible');var photo_modal = jQuery('.um-modal-body.photo:visible');if(photo_modal.length){modal.removeClass('uimob340');modal.removeClass('uimob500');var photo_ = jQuery('.um-modal-photo img');var photo_maxw = jQuery(window).width() - 60;var photo_maxh = jQuery(window).height() -(jQuery(window).height() * .25);photo_.css({'opacity':0});photo_.css({'max-width':photo_maxw});photo_.css({'max-height':photo_maxh});jQuery('.um-modal').css({'width':photo_.width(),'margin-left':'-'+photo_.width() / 2+'px'});photo_.animate({'opacity':1},1000);var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(modal.length){var element_width = jQuery(window).width();modal.removeClass('uimob340');modal.removeClass('uimob500');if(element_width <= 340){modal.addClass('uimob340');initCrop_UM();modal.animate({'bottom':0},300)}else if(element_width <= 500){modal.addClass('uimob500');initCrop_UM();modal.animate({'bottom':0},300)}else if(element_width <= 800){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(element_width <= 960){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(element_width>960){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}}}function um_remove_modal(){jQuery('.um-modal .um-single-image-preview img').cropper("destroy");jQuery('body,html,textarea').css("overflow","auto");jQuery(document).unbind('touchmove');jQuery('.um-modal div[id^="um_"]').hide().appendTo('body');jQuery('.um-modal,.um-modal-overlay').remove()}function um_modal_size(aclass){jQuery('.um-modal:visible').addClass(aclass)}function um_modal_add_attr(id,value){jQuery('.um-modal:visible').data(id,value)} +var live_field;var live_value;function um_conditional(){jQuery('.um-field.um-is-conditional').each(function(){for(var i = 0;i < 5;i++){var action0 = jQuery(this).data('cond-'+i+'-action');var field0 = jQuery(this).data('cond-'+i+'-field');var operator0 = jQuery(this).data('cond-'+i+'-operator');var value0 = jQuery(this).data('cond-'+i+'-value');if(action0 == 'show' && field0 == live_field){if(operator0 == 'empty'){if(live_value == ''){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'not empty'){if(live_value!= ''){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'equals to'){if(value0 == live_value){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'not equals'){if(jQuery.isNumeric(value0) && parseInt(live_value)!= parseInt(value0) && live_value){jQuery(this).fadeIn()}else if(!jQuery.isNumeric(value0) && value0!= live_value){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'greater than'){if(jQuery.isNumeric(value0) && parseInt(live_value)>parseInt(value0)){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'less than'){if(jQuery.isNumeric(value0) && parseInt(live_value) < parseInt(value0) && live_value){jQuery(this).fadeIn()}else{jQuery(this).hide()}}if(operator0 == 'contains'){if(live_value.indexOf(value0)>= 0){jQuery(this).fadeIn()}else{jQuery(this).hide()}}}if(action0 == 'hide' && field0 == live_field){if(operator0 == 'empty'){if(live_value == ''){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'not empty'){if(live_value!= ''){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'equals to'){if(value0 == live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'not equals'){if(jQuery.isNumeric(value0) && parseInt(live_value)!= parseInt(value0) && live_value){jQuery(this).hide()}else if(!jQuery.isNumeric(value0) && value0!= live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'greater than'){if(jQuery.isNumeric(value0) && parseInt(live_value)>parseInt(value0)){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'less than'){if(jQuery.isNumeric(value0) && parseInt(live_value) < parseInt(value0) && live_value){jQuery(this).hide()}else{jQuery(this).fadeIn()}}if(operator0 == 'contains'){if(live_value.indexOf(value0)>= 0){jQuery(this).hide()}else{jQuery(this).fadeIn()}}}}})}function UM_hide_menus(){menu = jQuery('.um-dropdown');menu.parents('div').find('a').removeClass('active');menu.hide()}function UM_domenus(){jQuery('.um-dropdown').each(function(){var menu = jQuery(this);var element = jQuery(this).attr('data-element');var position = jQuery(this).attr('data-position');jQuery(element).addClass('um-trigger-menu-on-'+menu.attr('data-trigger'));if(jQuery(window).width() <= 1200 && element == 'div.um-profile-edit'){position = 'lc'}if(position == 'lc'){if(200>jQuery(element).find('img').width()){left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)+((jQuery(element).find('img').width() - 200) / 2)}else{left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)}top_ = parseInt(jQuery(element).find('a').css('top'));if(top_){top_p = jQuery(element).find('img').height()+4+top_;left_gap = 4}else{top_p = jQuery(element).find('img').height()+4;left_gap = 0}if(top_p == 4 && element == 'div.um-cover'){top_p = jQuery(element).height() / 2+(menu.height() / 2)}else if(top_p == 4){top_p = jQuery(element).height()+20}gap_right = jQuery(element).width()+17;menu.css({'top':0,'width':200,'left':'auto','right':gap_right+'px','text-align':'center'});menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-right-b');menu.find('.um-dropdown-arr').css({'top':'4px','left':'auto','right':'-17px'})}if(position == 'bc'){if(200>jQuery(element).find('img').width()){left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)+((jQuery(element).find('img').width() - 200) / 2)}else{left_p =((jQuery(element).width() - jQuery(element).find('img').width()) / 2)}top_ = parseInt(jQuery(element).find('a').css('top'));if(top_){top_p = jQuery(element).find('img').height()+4+top_;left_gap = 4}else{top_p = jQuery(element).find('img').height()+4;left_gap = 0}if(top_p == 4 && element == 'div.um-cover'){top_p = jQuery(element).height() / 2+(menu.height() / 2)}else if(top_p == 4){top_p = jQuery(element).height()+20}menu.css({'top':top_p,'width':200,'left':left_p+left_gap,'right':'auto','text-align':'center'});menu.find('.um-dropdown-arr').find('i').removeClass().addClass('um-icon-arrow-up-b');menu.find('.um-dropdown-arr').css({'top':'-17px','left':(menu.width() / 2) - 12,'right':'auto'})}})}function um_responsive(){jQuery('.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')}if(jQuery('.um-account-nav').length>0 && jQuery('.um-account-side').is(':visible') && jQuery('.um-account-tab:visible').length == 0){jQuery('.um-account-side li a.current').trigger('click')}jQuery(this).css('opacity',1)});jQuery('.um-cover,.um-member-cover').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('.um-members').each(function(){UM_Member_Grid(jQuery(this))});UM_domenus()}function UM_Member_Grid(container){container.masonry({itemSelector:'.um-member',columnWidth:'.um-member',gutter:'.um-gutter-sizer'})}function initImageUpload_UM(trigger){if(trigger.data('upload_help_text')){upload_help_text = ''+trigger.data('upload_help_text')+''}else{upload_help_text = ''}if(trigger.data('icon')){icon = ''}else{icon = ''}if(trigger.data('upload_text')){upload_text = ''+trigger.data('upload_text')+''}else{upload_text = ''}trigger.uploadFile({url:ultimatemember_image_upload_url,method:"POST",multiple:false,formData:{key:trigger.data('key'),set_id:trigger.data('set_id'),set_mode:trigger.data('set_mode')},fileName:trigger.data('key'),allowedTypes:trigger.data('allowed_types'),maxFileSize:trigger.data('max_size'),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:trigger.data('max_size_error'),extErrorStr:trigger.data('extension_error'),maxFileCountErrorStr:trigger.data('max_files_error'),maxFileCount:1,showDelete:false,showAbort:false,showDone:false,showFileCounter:false,showStatusAfterSuccess:true,onSubmit:function(files){trigger.parents('.um-modal-body').find('.um-error-block').remove()},onSuccess:function(files,data,xhr){trigger.selectedFiles = 0;data = jQuery.parseJSON(data);if(data.error && data.error!= ''){trigger.parents('.um-modal-body').append('
'+data.error+'
');trigger.parents('.um-modal-body').find('.upload-statusbar').hide(0);um_modal_responsive()}else{jQuery.each(data,function(key,value){var img_id = trigger.parents('.um-modal-body').find('.um-single-image-preview img');var img_id_h = trigger.parents('.um-modal-body').find('.um-single-image-preview');img_id.attr("src",value);img_id.load(function(){trigger.parents('.um-modal-body').find('.um-modal-btn.um-finish-upload.disabled').removeClass('disabled');trigger.parents('.um-modal-body').find('.ajax-upload-dragdrop,.upload-statusbar').hide(0);img_id_h.show(0);um_modal_responsive()})})}}})}function initFileUpload_UM(trigger){if(trigger.data('upload_help_text')){upload_help_text = ''+trigger.data('upload_help_text')+''}else{upload_help_text = ''}if(trigger.data('icon')){icon = ''}else{icon = ''}if(trigger.data('upload_text')){upload_text = ''+trigger.data('upload_text')+''}else{upload_text = ''}trigger.uploadFile({url:ultimatemember_file_upload_url,method:"POST",multiple:false,formData:{key:trigger.data('key'),set_id:trigger.data('set_id'),set_mode:trigger.data('set_mode')},fileName:trigger.data('key'),allowedTypes:trigger.data('allowed_types'),maxFileSize:trigger.data('max_size'),dragDropStr:icon+upload_text+upload_help_text,sizeErrorStr:trigger.data('max_size_error'),extErrorStr:trigger.data('extension_error'),maxFileCountErrorStr:trigger.data('max_files_error'),maxFileCount:1,showDelete:false,showAbort:false,showDone:false,showFileCounter:false,showStatusAfterSuccess:true,onSubmit:function(files){trigger.parents('.um-modal-body').find('.um-error-block').remove()},onSuccess:function(files,data,xhr){trigger.selectedFiles = 0;data = jQuery.parseJSON(data);if(data.error && data.error!= ''){trigger.parents('.um-modal-body').append('
'+data.error+'
');trigger.parents('.um-modal-body').find('.upload-statusbar').hide(0);um_modal_responsive()}else{jQuery.each(data,function(key,value){trigger.parents('.um-modal-body').find('.um-modal-btn.um-finish-upload.disabled').removeClass('disabled');trigger.parents('.um-modal-body').find('.ajax-upload-dragdrop,.upload-statusbar').hide(0);trigger.parents('.um-modal-body').find('.um-single-file-preview').show(0);if(key == 'icon'){trigger.parents('.um-modal-body').find('.um-single-fileinfo i').removeClass().addClass(value)}else if(key == 'icon_bg'){trigger.parents('.um-modal-body').find('.um-single-fileinfo span.icon').css({'background-color':value})}else if(key == 'filename'){trigger.parents('.um-modal-body').find('.um-single-fileinfo span.filename').html(value)}else{trigger.parents('.um-modal-body').find('.um-single-fileinfo a').attr('href',value)}});um_modal_responsive()}}})}function initCrop_UM(){var target_img = jQuery('.um-modal:visible .um-single-image-preview img');var target_img_parent = jQuery('.um-modal:visible .um-single-image-preview');var crop_data = target_img.parent().attr('data-crop');var min_width = target_img.parent().attr('data-min_width');var min_height = target_img.parent().attr('data-min_height');var ratio = target_img.parent().attr('data-ratio');if(jQuery('.um-modal').find('#um_upload_single').attr('data-ratio')){var ratio = jQuery('.um-modal').find('#um_upload_single').attr('data-ratio');var ratio_split = ratio.split(':');var ratio = ratio_split[0]}if(target_img.length){if(target_img.attr('src')!= ''){var max_height = jQuery(window).height() -(jQuery('.um-modal-footer a').height()+20) - 50 -(jQuery('.um-modal-header:visible').height());target_img.css({'height':'auto'});target_img_parent.css({'height':'auto'});if(jQuery(window).height() <= 400){target_img_parent.css({'height':max_height+'px','max-height':max_height+'px'});target_img.css({'height':'auto'})}else{target_img.css({'height':'auto','max-height':max_height+'px'});target_img_parent.css({'height':target_img.height(),'max-height':max_height+'px'})}if(crop_data == 'square'){var opts ={minWidth:min_width,minHeight:min_height,dragCrop:false,aspectRatio:1.0,zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}else if(crop_data == 'cover'){var opts ={minWidth:min_width,minHeight:Math.round(min_width / ratio),dragCrop:false,aspectRatio:ratio,zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}else if(crop_data == 'user'){var opts ={minWidth:min_width,minHeight:min_height,dragCrop:true,aspectRatio:"auto",zoomable:false,rotatable:false,dashed:false,done:function(data){target_img.parent().attr('data-coord',Math.round(data.x)+','+Math.round(data.y)+','+Math.round(data.width)+','+Math.round(data.height))}}}if(crop_data!= 0){target_img.cropper(opts)}}}}function um_new_modal(id,size,isPhoto,source){var modal = jQuery('body').find('.um-modal-overlay');if(modal.length == 0){jQuery('.tipsy').hide();UM_hide_menus();jQuery('body,html,textarea').css("overflow","hidden");jQuery(document).bind("touchmove",function(e){e.preventDefault()});jQuery('.um-modal').on('touchmove',function(e){e.stopPropagation()});if(isPhoto){jQuery('body').append('
')}else{jQuery('body').append('
')}jQuery('#'+id).prependTo('.um-modal');if(isPhoto){jQuery('.um-modal').find('.um-modal-photo').html('');var photo_ = jQuery('.um-modal-photo img');var photo_maxw = jQuery(window).width() - 60;var photo_maxh = jQuery(window).height() -(jQuery(window).height() * .25);photo_.attr("src",source);photo_.load(function(){jQuery('#'+id).show();jQuery('.um-modal').show();photo_.css({'opacity':0});photo_.css({'max-width':photo_maxw});photo_.css({'max-height':photo_maxh});jQuery('.um-modal').css({'width':photo_.width(),'margin-left':'-'+photo_.width() / 2+'px'});photo_.animate({'opacity':1},1000);um_modal_responsive()})}else{jQuery('#'+id).show();jQuery('.um-modal').show();um_modal_size(size);initImageUpload_UM(jQuery('.um-modal:visible').find('.um-single-image-upload'));initFileUpload_UM(jQuery('.um-modal:visible').find('.um-single-file-upload'));um_modal_responsive()}}}function um_modal_responsive(){var modal = jQuery('.um-modal:visible');var photo_modal = jQuery('.um-modal-body.photo:visible');if(photo_modal.length){modal.removeClass('uimob340');modal.removeClass('uimob500');var photo_ = jQuery('.um-modal-photo img');var photo_maxw = jQuery(window).width() - 60;var photo_maxh = jQuery(window).height() -(jQuery(window).height() * .25);photo_.css({'opacity':0});photo_.css({'max-width':photo_maxw});photo_.css({'max-height':photo_maxh});jQuery('.um-modal').css({'width':photo_.width(),'margin-left':'-'+photo_.width() / 2+'px'});photo_.animate({'opacity':1},1000);var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(modal.length){var element_width = jQuery(window).width();modal.removeClass('uimob340');modal.removeClass('uimob500');if(element_width <= 340){modal.addClass('uimob340');initCrop_UM();modal.animate({'bottom':0},300)}else if(element_width <= 500){modal.addClass('uimob500');initCrop_UM();modal.animate({'bottom':0},300)}else if(element_width <= 800){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(element_width <= 960){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}else if(element_width>960){initCrop_UM();var half_gap =(jQuery(window).height() - modal.innerHeight()) / 2+'px';modal.animate({'bottom':half_gap},300)}}}function um_remove_modal(){jQuery('.um-modal .um-single-image-preview img').cropper("destroy");jQuery('body,html,textarea').css("overflow","auto");jQuery(document).unbind('touchmove');jQuery('.um-modal div[id^="um_"]').hide().appendTo('body');jQuery('.um-modal,.um-modal-overlay').remove()}function um_modal_size(aclass){jQuery('.um-modal:visible').addClass(aclass)}function um_modal_add_attr(id,value){jQuery('.um-modal:visible').data(id,value)} jQuery(window).load(function(){um_responsive();um_modal_responsive()});jQuery(window).resize(function(){jQuery(".um-modal .um-single-image-preview.crop:visible img").cropper("destroy");um_responsive();um_modal_responsive()});jQuery(document).ready(function(){jQuery(document).on("click",'.um-modal-overlay, a[data-action="um_remove_modal"]',function(){um_remove_modal()});jQuery(document).on("click",'a[data-modal^="um_"], span[data-modal^="um_"], .um-modal a',function(a){a.preventDefault();return false});jQuery(document).on("click",".um-modal .um-single-file-preview a.cancel",function(a){a.preventDefault();a=jQuery(this).parents(".um-modal-body");a.find(".um-single-file-preview").hide();a.find(".ajax-upload-dragdrop").show(); a.find(".um-modal-btn.um-finish-upload").addClass("disabled");um_modal_responsive();return false});jQuery(document).on("click",".um-modal .um-single-image-preview a.cancel",function(a){a.preventDefault();a=jQuery(this).parents(".um-modal-body");a.find(".um-modal .um-single-image-preview img").cropper("destroy");a.find(".um-single-image-preview img").attr("src","");a.find(".um-single-image-preview").hide();a.find(".ajax-upload-dragdrop").show();a.find(".um-modal-btn.um-finish-upload").addClass("disabled"); diff --git a/core/um-fields.php b/core/um-fields.php index 799e91e4..4b5be8b2 100644 --- a/core/um-fields.php +++ b/core/um-fields.php @@ -701,9 +701,16 @@ class UM_Fields { } if ( !isset( $array['ratio'] ) ) $array['ratio'] = 1.0; + if ( !isset( $array['min_width'] ) ) $array['min_width'] = ''; if ( !isset( $array['min_height'] ) ) $array['min_height'] = ''; + if ( $array['min_width'] == '' && $array['crop'] == 1 ) $array['min_width'] = 600; + if ( $array['min_height'] == '' && $array['crop'] == 1 ) $array['min_height'] = 600; + + if ( $array['min_width'] == '' && $array['crop'] == 3 ) $array['min_width'] = 600; + if ( $array['min_height'] == '' && $array['crop'] == 3 ) $array['min_height'] = 600; + if (!isset($array['invalid_image'])) $array['invalid_image'] = "Please upload a valid image!"; if (!isset($array['allowed_types'])) { $array['allowed_types'] = "gif,jpg,jpeg,png"; diff --git a/core/um-setup.php b/core/um-setup.php index dc308de8..96110ed7 100644 --- a/core/um-setup.php +++ b/core/um-setup.php @@ -92,7 +92,7 @@ class UM_Setup { '_um_profile_template' => 'profile', '_um_profile_max_width' => '1000px', '_um_profile_align' => 'center', - '_um_profile_icons' => 'field', + '_um_profile_icons' => 'label', '_um_profile_cover_enabled' => 1, '_um_profile_cover_ratio' => '2.7:1', '_um_profile_photosize' => '190px', @@ -117,7 +117,7 @@ class UM_Setup { '_um_register_template' => 'register', '_um_register_max_width' => '450px', '_um_register_align' => 'center', - '_um_register_icons' => 'field', + '_um_register_icons' => 'label', '_um_register_primary_btn_word' => 'Register', '_um_register_primary_btn_color' => '#3ba1da', '_um_register_primary_btn_hover' => '#44b0ec', @@ -130,7 +130,7 @@ class UM_Setup { '_um_login_template' => 'login', '_um_login_max_width' => '450px', '_um_login_align' => 'center', - '_um_login_icons' => 'field', + '_um_login_icons' => 'label', '_um_login_primary_btn_word' => 'Login', '_um_login_primary_btn_color' => '#3ba1da', '_um_login_primary_btn_hover' => '#44b0ec',