From 0ca9213dbee7f59dac94bd2918c82948f859643e Mon Sep 17 00:00:00 2001
From: nikitozzzzzzz <nsinelnikov.work@gmail.com>
Date: Fri, 9 Nov 2018 16:21:34 +0200
Subject: [PATCH] - fixed conditional js; - fixed um_ prefix for role data;

---
 assets/js/um-conditional.js                | 1135 ++++++++++----------
 assets/js/um-conditional.min.js            |    2 +-
 assets/js/um-scripts.js                    |    4 +-
 assets/js/um-scripts.min.js                |    2 +-
 includes/core/class-enqueue.php            |    6 +-
 includes/core/class-roles-capabilities.php |    7 +-
 languages/ultimate-member-en_US.po         |   63 +-
 7 files changed, 605 insertions(+), 614 deletions(-)

diff --git a/assets/js/um-conditional.js b/assets/js/um-conditional.js
index 11a58835..2e66c913 100644
--- a/assets/js/um-conditional.js
+++ b/assets/js/um-conditional.js
@@ -1,507 +1,572 @@
+var arr_all_conditions = []; //raw
+var um_field_conditions = {}; // filtered
+var um_field_default_values = {};
+
+/**
+ * Get field default value
+ * @param object $dom
+ * @return string
+ */
+function um_get_field_default_value( $dom ) {
+	var default_value = '';
+	var type = um_get_field_type($dom);
+	switch ( type ) {
+
+		case 'text':
+		case 'number':
+		case 'date':
+		case 'textarea':
+		case 'select':
+			default_value = $dom.find('input:text,input[type=number],textarea,select').val();
+			break;
+
+		case 'multiselect':
+			default_value = $dom.find('select').val();
+			break;
+
+		case 'radio':
+			if ($dom.find('input[type=radio]:checked').length >= 1) {
+				default_value = $dom.find('input[type=radio]:checked').val();
+			}
+
+			break;
+		case 'checkbox':
+
+			if ($dom.find('input[type=checkbox]:checked').length >= 1) {
+
+				if ($dom.find('input[type=checkbox]:checked').length > 1) {
+					$dom.find('input[type=checkbox]:checked').each(function () {
+						default_value = default_value + jQuery(this).val() + ' ';
+					});
+				} else {
+					default_value = $dom.find('input[type=checkbox]:checked').val();
+				}
+
+			}
+			break;
+	}
+
+	return {type: type, value: default_value};
+}
+
+/**
+ * Get field element by field wrapper
+ * @param  object $dom
+ * @return object
+ */
+function um_get_field_element( $dom ) {
+	var default_value = '';
+	var type = um_get_field_type($dom);
+
+	switch ( type ) {
+
+		case 'text':
+		case 'number':
+		case 'date':
+		case 'textarea':
+		case 'select':
+		case 'multiselect':
+		case 'radio':
+		case 'checkbox':
+			return $dom.find('input,textarea,select');
+			break;
+
+
+	}
+
+	return '';
+}
+
+/**
+ * Get field type
+ * @param  object $dom
+ * @return string
+ */
+function um_get_field_type($dom) {
+	var type = '';
+	var classes = $dom.attr( 'class' );
+	jQuery.each( classes.split(' '), function (i, d) {
+		if (d.indexOf('um-field-type') != -1) {
+			type = d.split('_')[1];
+		}
+	});
+
+	return type;
+
+}
+
+/**
+ * Get field siblings/chidren conditions
+ * @param  string field_key
+ * @return array
+ */
+function um_get_field_children(field_key) {
+	var arr_conditions = [];
+	jQuery.each(arr_all_conditions, function (ii, condition) {
+		if (condition.field.parent == field_key) {
+			arr_conditions.push(condition.field.condition);
+		}
+	});
+
+	return arr_conditions;
+
+}
+
+/**
+ * Split single array to multi-dimensional array
+ * @param  array arr
+ * @param  integer n
+ * @return array
+ */
+function um_splitup_array(arr, n) {
+	var rest = arr.length % n,
+		restUsed = rest,
+		partLength = Math.floor(arr.length / n),
+		result = [];
+
+	for (var i = 0; i < arr.length; i += partLength) {
+		var end = partLength + i,
+			add = false;
+
+		if (rest !== 0 && restUsed) {
+			end++;
+			restUsed--;
+			add = true;
+		}
+
+		result.push(arr.slice(i, end));
+
+		if (add) {
+			i++;
+		}
+	}
+
+	var obj_result = [];
+	jQuery.each(result, function (ii, dd) {
+		obj_result.push({
+			action: dd[0],
+			if_field: dd[1],
+			operator: dd[2],
+			value: dd[3]
+		})
+	});
+
+	return obj_result;
+}
+
+/**
+ * Get field live value
+ * @param  object $dom
+ * @return mixed
+ */
+function um_get_field_data($dom) {
+	um_live_field = $dom.parents('.um-field').data('key');
+	um_live_value = $dom.val();
+
+	if ($dom.is(':checkbox')) {
+
+		um_live_value = '';
+
+		if ($dom.parents('.um-field').find('input:checked').length > 1) {
+			$dom.parents('.um-field').find('input:checked').each(function () {
+				um_live_value = um_live_value + jQuery(this).val() + ' ';
+			});
+		} else {
+			if ($dom.parents('.um-field').find('input:checked').length >= 1) {
+				um_live_value = $dom.parents('.um-field').find('input:checked').val();
+			}
+		}
+
+	}
+
+	if ($dom.is(':radio')) {
+		um_live_value = $dom.parents('.um-field').find('input[type=radio]:checked').val();
+	}
+
+	return um_live_value;
+
+}
+
+function um_in_array(needle, haystack, strict){
+	var found = false, key, strict = !!strict;
+	for (key in haystack) {
+		if ((strict && haystack[key] === needle) || (!strict && haystack[key] == needle)) {
+			found = true;
+			break;
+		}
+	}
+
+	return found;
+}
+
+/**
+ * Apply field conditions
+ * @param  object  $dom
+ * @param  boolean is_single_update
+ */
+function um_apply_conditions($dom, is_single_update) {
+	var operators = ['empty', 'not empty', 'equals to', 'not equals', 'greater than', 'less than', 'contains'];
+	var key = $dom.parents('.um-field[data-key]').data('key');
+	var conditions = um_field_conditions[key];
+
+	var live_field_value = um_get_field_data($dom);
+
+	var $owners = {};
+	var $owners_values = {};
+	var $owner_conditions = {};
+
+	jQuery.each(conditions, function (index, condition) {
+		if (typeof $owners_values[condition.owner] == 'undefined') {
+			$owners_values[condition.owner] = [];
+			$owner_conditions[condition.owner] = {}
+		}
+		$owners_values[condition.owner].push(condition.value);
+		$owner_conditions[condition.owner] = condition;
+	});
+
+	jQuery.each(conditions, function (index, condition) {
+		if (typeof $owners[condition.owner] == 'undefined') {
+			$owners[condition.owner] = {};
+		}
+		if (condition.operator == 'empty') {
+			if (!live_field_value || live_field_value == '' && um_in_array(live_field_value, $owners_values[condition.owner])) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if (condition.operator == 'not empty') {
+			if (live_field_value && live_field_value != '' && !um_in_array(live_field_value, $owners_values[condition.owner])) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if (condition.operator == 'equals to') {
+			if (condition.value == live_field_value && um_in_array(live_field_value, $owners_values[condition.owner])) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if (condition.operator == 'not equals') {
+			if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) != parseInt(condition.value) && live_field_value && !um_in_array(live_field_value, $owners_values[condition.owner])) {
+				$owners[condition.owner][index] = true;
+			} else if (condition.value != live_field_value && !um_in_array(live_field_value, $owners_values[condition.owner])) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if (condition.operator == 'greater than') {
+			if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) > parseInt(condition.value)) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if (condition.operator == 'less than') {
+			if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) < parseInt(condition.value)) {
+				$owners[condition.owner][index] = true;
+			} else {
+				$owners[condition.owner][index] = false;
+			}
+		}
+
+		if ( condition.operator == 'contains' ) {
+			if ( 'multiselect' == um_get_field_type( $dom.parents('.um-field[data-key]') ) ) {
+				if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 && um_in_array( condition.value, live_field_value ) ) {
+					$owners[condition.owner][index] = true;
+				} else {
+					$owners[condition.owner][index] = false;
+				}
+			} else if ( 'checkbox' == um_get_field_type( $dom.parents('.um-field[data-key]') ) ) {
+				if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 ) {
+					$owners[condition.owner][index] = true;
+				} else {
+					$owners[condition.owner][index] = false;
+				}
+			} else {
+				if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 && um_in_array( live_field_value, $owners_values[ condition.owner ] ) ) {
+					$owners[condition.owner][index] = true;
+				} else {
+					$owners[condition.owner][index] = false;
+				}
+			}
+		}
+
+	}); // end foreach `conditions`
+	jQuery.each($owners, function (index, field) {
+		if (um_in_array(true, field)) {
+			um_field_apply_action($dom, $owner_conditions[index], true);
+		} else {
+			um_field_apply_action($dom, $owner_conditions[index], false);
+		}
+	});
+	$dom.trigger('um_fields_change');
+
+}
+
+/**
+ * Apply condition's action
+ * @param  object  $dom
+ * @param  string  condition
+ * @param  boolean is_true
+ */
+function um_field_apply_action($dom, condition, is_true) {
+	var child_dom = jQuery('div.um-field[data-key="' + condition.owner + '"]');
+
+	if (condition.action == 'show' && is_true /*&& child_dom.is(':hidden')*/) {
+		child_dom.show();
+		_show_in_ie( child_dom );
+		um_field_restore_default_value(child_dom);
+	}
+
+	if (condition.action == 'show' && !is_true /*&& child_dom.is(':visible') */) {
+		child_dom.hide();
+		_hide_in_ie( child_dom );
+	}
+
+	if (condition.action == 'hide' && is_true  /*&& child_dom.is(':visible')*/) {
+		child_dom.hide();
+		_hide_in_ie( child_dom );
+	}
+
+	if (condition.action == 'hide' && !is_true /*&& child_dom.is(':hidden')*/) {
+		child_dom.show();
+		_show_in_ie( child_dom );
+		um_field_restore_default_value( child_dom );
+
+	}
+	$dom.removeClass('um-field-has-changed');
+}
+
+/**
+ * Restores default field value
+ * @param  object $dom
+ */
+function um_field_restore_default_value( $dom ) {
+	//um_field_default_values
+
+	var type = um_get_field_type( $dom );
+	var key = $dom.data('key');
+	var field = um_field_default_values[key];
+	switch ( type ) {
+
+		case 'text':
+		case 'number':
+		case 'date':
+		case 'textarea':
+			$dom.find('input:text,input[type=number],textareas').val(field.value);
+			break;
+
+		case 'select':
+			$dom.find('select').find('option').prop('selected', false);
+			$dom.find('select').val(field.value);
+			$dom.find('select').trigger('change');
+			break;
+
+		case 'multiselect':
+			$dom.find('select').find('option').prop('selected', false);
+			jQuery.each(field.value, function (i, value) {
+				$dom.find('select').find('option[value="' + value + '"]').attr('selected', true);
+			});
+			$dom.find('select').trigger('change');
+			break;
+
+		case 'checkbox':
+
+			if ( $dom.find('input[type=checkbox]:checked').length >= 1 ) {
+
+				$dom.find('input[type=checkbox]:checked').removeAttr('checked');
+				$dom.find('span.um-field-checkbox-state i').removeClass('um-icon-android-checkbox-outline');
+				$dom.find('span.um-field-checkbox-state i').addClass('um-icon-android-checkbox-outline-blank');
+				$dom.find('.um-field-checkbox.active').removeClass('active');
+
+				if (jQuery.isArray(field.value)) {
+					jQuery.each(field.value, function (i, value) {
+						var cbox_elem = $dom.find('input[type=checkbox][value="' + value + '"]');
+						cbox_elem.attr('checked', true);
+						cbox_elem.closest('.um-field-checkbox').find('i').removeClass('um-icon-android-checkbox-outline-blank');
+						cbox_elem.closest('.um-field-checkbox').find('i').addClass('um-icon-android-checkbox-outline');
+						cbox_elem.closest('.um-field-checkbox').addClass('active');
+					});
+				} else {
+					var cbox_elem = $dom.find('input[type=checkbox][value="' + field.value + '"]');
+					cbox_elem.attr('checked', true);
+					cbox_elem.closest('.um-field-checkbox').find('i').removeClass('um-icon-android-checkbox-outline-blank');
+					cbox_elem.closest('.um-field-checkbox').find('i').addClass('um-icon-android-checkbox-outline');
+					cbox_elem.closest('.um-field-checkbox').addClass('active');
+				}
+
+			}
+
+			break;
+		case 'radio':
+
+			if ( $dom.find('input[type=radio]:checked').length >= 1 ) {
+
+				setTimeout(function () {
+
+					$dom.find('input[type=radio]:checked').removeAttr('checked');
+
+					$dom.find('span.um-field-radio-state i').removeClass('um-icon-android-radio-button-on');
+					$dom.find('span.um-field-radio-state i').addClass('um-icon-android-radio-button-off');
+					$dom.find('.um-field-radio.active').removeClass('active');
+
+					var radio_elem = $dom.find("input[type=radio][value='" + field.value + "']");
+					radio_elem.attr('checked', true);
+					radio_elem.closest('.um-field-radio').find('i').removeClass('um-icon-android-radio-button-off');
+					radio_elem.closest('.um-field-radio').find('i').addClass('um-icon-android-radio-button-on');
+					radio_elem.closest('.um-field-radio').addClass('active');
+
+				}, 100);
+			}
+
+			break;
+
+
+	} // end switch type
+
+
+	if ( ! $dom.hasClass( 'um-field-has-changed' ) ) {
+		var me = um_get_field_element( $dom );
+
+		if ( type == 'radio' || type == 'checkbox' ) {
+			me = me.find( ':checked' );
+		}
+
+		if ( me ) {
+			me.trigger( 'change' );
+			$dom.addClass( 'um-field-has-changed' );
+		}
+
+		/*
+		maybe future fix
+		if ( me ) {
+			if ( type == 'radio' || type == 'checkbox' ) {
+				me.each( function() {
+				   if ( jQuery(this).is(':checked') ) {
+					   jQuery(this).trigger('change');
+				   }
+				});
+			} else {
+				me.trigger( 'change' );
+			}
+
+			$dom.addClass( 'um-field-has-changed' );
+		}*/
+	}
+}
+
+/**
+ * Hides sibling/child field when parent field is hidden
+ */
+function um_field_hide_siblings() {
+
+	jQuery.each(um_field_conditions, function (index, conditions) {
+		if (jQuery('.um-field[data-key="' + index + '"]:hidden').length >= 1 || jQuery('.um-field[data-key="' + index + '"]').css('display') == 'none') {
+			jQuery.each(conditions, function (key, condition) {
+				jQuery('.um-field[data-key="' + condition.owner + '"]').hide();
+			});
+		}
+
+	});
+
+}
+
+/**
+ * Hides div for IE browser
+ * @param  object $dom
+ */
+function _hide_in_ie( $dom ){
+	if ( typeof( jQuery.browser ) != 'undefined' && jQuery.browser.msie ) {
+		$dom.css({"visibility":"hidden"});
+	}
+}
+
+/**
+ * Shows div for IE browser
+ * @param  object $dom
+ */
+function _show_in_ie( $dom ){
+	if ( typeof( jQuery.browser ) != 'undefined' && jQuery.browser.msie ) {
+		$dom.css({"visibility":"visible"});
+	}
+}
+
+/**
+ * UM Conditional fields Init
+ */
+function um_init_field_conditions() {
+	var arr_field_keys = [];
+
+	jQuery( '.um-field[data-key]' ).each( function() {
+
+		var key = jQuery(this).data( 'key' );
+
+		arr_field_keys.push( key );
+
+		var parse_attrs = {};
+		jQuery.each( jQuery(this)[0].attributes, function ( index, attribute ) {
+			if ( attribute.name.indexOf( 'data-cond' ) != -1 ) {
+				// replace "data-cond-"
+				var cond_field_id_and_attr = attribute.name.slice( 10 );
+				// return "n"
+				var cond_field_id = cond_field_id_and_attr.substring( 1, 0 );
+				//replace "n-"
+				var cond_field_attr = cond_field_id_and_attr.slice( 2 );
+
+				if ( typeof parse_attrs[cond_field_id] == 'undefined' )
+					parse_attrs[cond_field_id] = {};
+
+				parse_attrs[cond_field_id][cond_field_attr] = attribute.value;
+			}
+		});
+
+		jQuery.each( parse_attrs, function ( ii, dd ) {
+			var obj = {'field' :{
+					owner: key,
+					action: dd.action,
+					parent: dd.field,
+					operator: dd.operator,
+					value: dd.value,
+					condition: {
+						owner: key,
+						action: dd.action,
+						operator: dd.operator,
+						value: dd.value
+					}
+				}};
+
+			arr_all_conditions.push(obj);
+		});
+
+		um_field_default_values[jQuery(this).data('key')] = um_get_field_default_value( jQuery(this) );
+	});
+
+	jQuery.each( arr_field_keys, function ( i, field_key ) {
+		um_field_conditions[field_key] = um_get_field_children( field_key );
+	});
+
+	jQuery( '.um-field[data-key]:visible' ).each( function() {
+		var $wrap_dom = jQuery(this);
+		var me = um_get_field_element( $wrap_dom );
+		if ( typeof me.trigger !== 'undefined' ) {
+			me.trigger( 'change' );
+		}
+	});
+
+}
+
+
 jQuery(document).ready( function (){
 
-    var arr_all_conditions = []; //raw
-    var um_field_conditions = {}; // filtered
-    var um_field_default_values = {};
-
-    /**
-     * Get field default value
-     * @param object $dom
-     * @return string
-     */
-    function um_get_field_default_value( $dom ) {
-        var default_value = '';
-        var type = um_get_field_type($dom);
-        switch ( type ) {
-
-            case 'text':
-            case 'number':
-            case 'date':
-            case 'textarea':
-            case 'select':
-                default_value = $dom.find('input:text,input[type=number],textarea,select').val();
-                break;
-
-            case 'multiselect':
-                default_value = $dom.find('select').val();
-                break;
-
-            case 'radio':
-                if ($dom.find('input[type=radio]:checked').length >= 1) {
-                    default_value = $dom.find('input[type=radio]:checked').val();
-                }
-
-                break;
-            case 'checkbox':
-
-                if ($dom.find('input[type=checkbox]:checked').length >= 1) {
-
-                    if ($dom.find('input[type=checkbox]:checked').length > 1) {
-                        $dom.find('input[type=checkbox]:checked').each(function () {
-                            default_value = default_value + jQuery(this).val() + ' ';
-                        });
-                    } else {
-                        default_value = $dom.find('input[type=checkbox]:checked').val();
-                    }
-
-                }
-                break;
-        }
-
-        return {type: type, value: default_value};
-    }
-
-    /**
-     * Get field element by field wrapper
-     * @param  object $dom
-     * @return object
-     */
-    function um_get_field_element( $dom ) {
-        var default_value = '';
-        var type = um_get_field_type($dom);
-
-        switch ( type ) {
-
-            case 'text':
-            case 'number':
-            case 'date':
-            case 'textarea':
-            case 'select':
-            case 'multiselect':
-            case 'radio':
-            case 'checkbox':
-                return $dom.find('input,textarea,select');
-                break;
-
-
-        }
-
-        return '';
-    }
-
-    /**
-     * Get field type
-     * @param  object $dom
-     * @return string
-     */
-    function um_get_field_type($dom) {
-        var type = '';
-        var classes = $dom.attr( 'class' );
-        jQuery.each( classes.split(' '), function (i, d) {
-            if (d.indexOf('um-field-type') != -1) {
-                type = d.split('_')[1];
-            }
-        });
-
-        return type;
-
-    }
-
-    /**
-     * Get field siblings/chidren conditions
-     * @param  string field_key
-     * @return array
-     */
-    function um_get_field_children(field_key) {
-        var arr_conditions = [];
-        jQuery.each(arr_all_conditions, function (ii, condition) {
-            if (condition.field.parent == field_key) {
-                arr_conditions.push(condition.field.condition);
-            }
-        });
-
-        return arr_conditions;
-
-    }
-
-    /**
-     * Split single array to multi-dimensional array
-     * @param  array arr
-     * @param  integer n
-     * @return array
-     */
-    function um_splitup_array(arr, n) {
-        var rest = arr.length % n,
-            restUsed = rest,
-            partLength = Math.floor(arr.length / n),
-            result = [];
-
-        for (var i = 0; i < arr.length; i += partLength) {
-            var end = partLength + i,
-                add = false;
-
-            if (rest !== 0 && restUsed) {
-                end++;
-                restUsed--;
-                add = true;
-            }
-
-            result.push(arr.slice(i, end));
-
-            if (add) {
-                i++;
-            }
-        }
-
-        var obj_result = [];
-        jQuery.each(result, function (ii, dd) {
-            obj_result.push({
-                action: dd[0],
-                if_field: dd[1],
-                operator: dd[2],
-                value: dd[3]
-            })
-        });
-
-        return obj_result;
-    }
-
-    /**
-     * Get field live value
-     * @param  object $dom
-     * @return mixed
-     */
-    function um_get_field_data($dom) {
-        um_live_field = $dom.parents('.um-field').data('key');
-        um_live_value = $dom.val();
-
-        if ($dom.is(':checkbox')) {
-
-            um_live_value = '';
-
-            if ($dom.parents('.um-field').find('input:checked').length > 1) {
-                $dom.parents('.um-field').find('input:checked').each(function () {
-                    um_live_value = um_live_value + jQuery(this).val() + ' ';
-                });
-            } else {
-                if ($dom.parents('.um-field').find('input:checked').length >= 1) {
-                    um_live_value = $dom.parents('.um-field').find('input:checked').val();
-                }
-            }
-
-        }
-
-        if ($dom.is(':radio')) {
-            um_live_value = $dom.parents('.um-field').find('input[type=radio]:checked').val();
-        }
-
-        return um_live_value;
-
-    }
-
-    function um_in_array(needle, haystack, strict){
-        var found = false, key, strict = !!strict;
-        for (key in haystack) {
-            if ((strict && haystack[key] === needle) || (!strict && haystack[key] == needle)) {
-                found = true;
-                break;
-            }
-        }
-
-        return found;
-    }
-
-    /**
-     * Apply field conditions
-     * @param  object  $dom
-     * @param  boolean is_single_update
-     */
-    function um_apply_conditions($dom, is_single_update) {
-        var operators = ['empty', 'not empty', 'equals to', 'not equals', 'greater than', 'less than', 'contains'];
-        var key = $dom.parents('.um-field[data-key]').data('key');
-        var conditions = um_field_conditions[key];
-
-        var live_field_value = um_get_field_data($dom);
-
-        var $owners = {};
-        var $owners_values = {};
-        var $owner_conditions = {};
-
-        jQuery.each(conditions, function (index, condition) {
-            if (typeof $owners_values[condition.owner] == 'undefined') {
-                $owners_values[condition.owner] = [];
-                $owner_conditions[condition.owner] = {}
-            }
-            $owners_values[condition.owner].push(condition.value);
-            $owner_conditions[condition.owner] = condition;
-        });
-
-        jQuery.each(conditions, function (index, condition) {
-            if (typeof $owners[condition.owner] == 'undefined') {
-                $owners[condition.owner] = {};
-            }
-            if (condition.operator == 'empty') {
-                if (!live_field_value || live_field_value == '' && um_in_array(live_field_value, $owners_values[condition.owner])) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if (condition.operator == 'not empty') {
-                if (live_field_value && live_field_value != '' && !um_in_array(live_field_value, $owners_values[condition.owner])) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if (condition.operator == 'equals to') {
-                if (condition.value == live_field_value && um_in_array(live_field_value, $owners_values[condition.owner])) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if (condition.operator == 'not equals') {
-                if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) != parseInt(condition.value) && live_field_value && !um_in_array(live_field_value, $owners_values[condition.owner])) {
-                    $owners[condition.owner][index] = true;
-                } else if (condition.value != live_field_value && !um_in_array(live_field_value, $owners_values[condition.owner])) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if (condition.operator == 'greater than') {
-                if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) > parseInt(condition.value)) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if (condition.operator == 'less than') {
-                if (jQuery.isNumeric(condition.value) && parseInt(live_field_value) < parseInt(condition.value)) {
-                    $owners[condition.owner][index] = true;
-                } else {
-                    $owners[condition.owner][index] = false;
-                }
-            }
-
-            if ( condition.operator == 'contains' ) {
-                if ( 'multiselect' == um_get_field_type( $dom.parents('.um-field[data-key]') ) ) {
-                    if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 && um_in_array( condition.value, live_field_value ) ) {
-                        $owners[condition.owner][index] = true;
-                    } else {
-                        $owners[condition.owner][index] = false;
-                    }
-                } else if ( 'checkbox' == um_get_field_type( $dom.parents('.um-field[data-key]') ) ) {
-                    if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 ) {
-                        $owners[condition.owner][index] = true;
-                    } else {
-                        $owners[condition.owner][index] = false;
-                    }
-                } else {
-                    if ( live_field_value && live_field_value.indexOf( condition.value ) >= 0 && um_in_array( live_field_value, $owners_values[ condition.owner ] ) ) {
-                        $owners[condition.owner][index] = true;
-                    } else {
-                        $owners[condition.owner][index] = false;
-                    }
-                }
-            }
-
-        }); // end foreach `conditions`
-        jQuery.each($owners, function (index, field) {
-            if (um_in_array(true, field)) {
-                um_field_apply_action($dom, $owner_conditions[index], true);
-            } else {
-                um_field_apply_action($dom, $owner_conditions[index], false);
-            }
-        });
-        $dom.trigger('um_fields_change');
-
-    }
-
-    /**
-     * Apply condition's action
-     * @param  object  $dom
-     * @param  string  condition
-     * @param  boolean is_true
-     */
-    function um_field_apply_action($dom, condition, is_true) {
-        var child_dom = jQuery('div.um-field[data-key="' + condition.owner + '"]');
-
-        if (condition.action == 'show' && is_true /*&& child_dom.is(':hidden')*/) {
-            child_dom.show();
-            _show_in_ie( child_dom );
-            um_field_restore_default_value(child_dom);
-        }
-
-        if (condition.action == 'show' && !is_true /*&& child_dom.is(':visible') */) {
-            child_dom.hide();
-            _hide_in_ie( child_dom );
-        }
-
-        if (condition.action == 'hide' && is_true  /*&& child_dom.is(':visible')*/) {
-            child_dom.hide();
-             _hide_in_ie( child_dom );
-       }
-
-        if (condition.action == 'hide' && !is_true /*&& child_dom.is(':hidden')*/) {
-            child_dom.show();
-            _show_in_ie( child_dom );
-            um_field_restore_default_value( child_dom );
-
-        }
-        $dom.removeClass('um-field-has-changed');
-    }
-
-    /**
-     * Restores default field value
-     * @param  object $dom
-     */
-    function um_field_restore_default_value( $dom ) {
-        //um_field_default_values
-
-        var type = um_get_field_type( $dom );
-        var key = $dom.data('key');
-        var field = um_field_default_values[key];
-        switch ( type ) {
-
-            case 'text':
-            case 'number':
-            case 'date':
-            case 'textarea':
-                $dom.find('input:text,input[type=number],textareas').val(field.value);
-                break;
-
-            case 'select':
-                $dom.find('select').find('option').prop('selected', false);
-                $dom.find('select').val(field.value);
-                $dom.find('select').trigger('change');
-                break;
-
-            case 'multiselect':
-                $dom.find('select').find('option').prop('selected', false);
-                jQuery.each(field.value, function (i, value) {
-                    $dom.find('select').find('option[value="' + value + '"]').attr('selected', true);
-                });
-                $dom.find('select').trigger('change');
-                break;
-
-            case 'checkbox':
-
-                if ( $dom.find('input[type=checkbox]:checked').length >= 1 ) {
-
-                    $dom.find('input[type=checkbox]:checked').removeAttr('checked');
-                    $dom.find('span.um-field-checkbox-state i').removeClass('um-icon-android-checkbox-outline');
-                    $dom.find('span.um-field-checkbox-state i').addClass('um-icon-android-checkbox-outline-blank');
-                    $dom.find('.um-field-checkbox.active').removeClass('active');
-
-                    if (jQuery.isArray(field.value)) {
-                        jQuery.each(field.value, function (i, value) {
-                            var cbox_elem = $dom.find('input[type=checkbox][value="' + value + '"]');
-                            cbox_elem.attr('checked', true);
-                            cbox_elem.closest('.um-field-checkbox').find('i').removeClass('um-icon-android-checkbox-outline-blank');
-                            cbox_elem.closest('.um-field-checkbox').find('i').addClass('um-icon-android-checkbox-outline');
-                            cbox_elem.closest('.um-field-checkbox').addClass('active');
-                        });
-                    } else {
-                        var cbox_elem = $dom.find('input[type=checkbox][value="' + field.value + '"]');
-                        cbox_elem.attr('checked', true);
-                        cbox_elem.closest('.um-field-checkbox').find('i').removeClass('um-icon-android-checkbox-outline-blank');
-                        cbox_elem.closest('.um-field-checkbox').find('i').addClass('um-icon-android-checkbox-outline');
-                        cbox_elem.closest('.um-field-checkbox').addClass('active');
-                    }
-
-                }
-
-                break;
-            case 'radio':
-
-                if ( $dom.find('input[type=radio]:checked').length >= 1 ) {
-
-                    setTimeout(function () {
-
-                        $dom.find('input[type=radio]:checked').removeAttr('checked');
-
-                        $dom.find('span.um-field-radio-state i').removeClass('um-icon-android-radio-button-on');
-                        $dom.find('span.um-field-radio-state i').addClass('um-icon-android-radio-button-off');
-                        $dom.find('.um-field-radio.active').removeClass('active');
-
-                        var radio_elem = $dom.find("input[type=radio][value='" + field.value + "']");
-                        radio_elem.attr('checked', true);
-                        radio_elem.closest('.um-field-radio').find('i').removeClass('um-icon-android-radio-button-off');
-                        radio_elem.closest('.um-field-radio').find('i').addClass('um-icon-android-radio-button-on');
-                        radio_elem.closest('.um-field-radio').addClass('active');
-
-                    }, 100);
-                }
-
-                break;
-
-
-        } // end switch type
-
-
-        if ( ! $dom.hasClass( 'um-field-has-changed' ) ) {
-            var me = um_get_field_element( $dom );
-
-            if ( type == 'radio' || type == 'checkbox' ) {
-                me = me.find( ':checked' );
-            }
-
-            if ( me ) {
-                me.trigger( 'change' );
-                $dom.addClass( 'um-field-has-changed' );
-            }
-
-            /*
-            maybe future fix
-            if ( me ) {
-                if ( type == 'radio' || type == 'checkbox' ) {
-                    me.each( function() {
-                       if ( jQuery(this).is(':checked') ) {
-                           jQuery(this).trigger('change');
-                       }
-                    });
-                } else {
-                    me.trigger( 'change' );
-                }
-
-                $dom.addClass( 'um-field-has-changed' );
-            }*/
-        }
-    }
-
-    /**
-     * Hides sibling/child field when parent field is hidden
-     */
-    function um_field_hide_siblings() {
-
-        jQuery.each(um_field_conditions, function (index, conditions) {
-            if (jQuery('.um-field[data-key="' + index + '"]:hidden').length >= 1 || jQuery('.um-field[data-key="' + index + '"]').css('display') == 'none') {
-                jQuery.each(conditions, function (key, condition) {
-                    jQuery('.um-field[data-key="' + condition.owner + '"]').hide();
-                });
-            }
-
-        });
-
-    }
-
-    /**
-     * Hides div for IE browser
-     * @param  object $dom
-     */
-    function _hide_in_ie( $dom ){
-        if ( typeof( jQuery.browser ) != 'undefined' && jQuery.browser.msie ) {
-           $dom.css({"visibility":"hidden"});
-        }
-    }
-
-    /**
-     * Shows div for IE browser
-     * @param  object $dom
-     */
-    function _show_in_ie( $dom ){
-        if ( typeof( jQuery.browser ) != 'undefined' && jQuery.browser.msie ) {
-           $dom.css({"visibility":"visible"});
-        }
-    }
-
     jQuery(document).on('change', '.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]', function () {
         var me = jQuery(this);
         um_apply_conditions(me, false);
@@ -527,71 +592,5 @@ jQuery(document).ready( function (){
         um_field_hide_siblings(); // dupes, issue with false field wrapper's visiblity validations. requires optimization.
     });
 
-
-    /**
-     * UM Conditional fields Init
-     */
-    function um_init_field_conditions() {
-        var arr_field_keys = [];
-
-        jQuery( '.um-field[data-key]' ).each( function() {
-
-            var key = jQuery(this).data( 'key' );
-
-            arr_field_keys.push( key );
-
-            var parse_attrs = {};
-            jQuery.each( jQuery(this)[0].attributes, function ( index, attribute ) {
-                if ( attribute.name.indexOf( 'data-cond' ) != -1 ) {
-                    // replace "data-cond-"
-                    var cond_field_id_and_attr = attribute.name.slice( 10 );
-                    // return "n"
-                    var cond_field_id = cond_field_id_and_attr.substring( 1, 0 );
-                    //replace "n-"
-                    var cond_field_attr = cond_field_id_and_attr.slice( 2 );
-
-                    if ( typeof parse_attrs[cond_field_id] == 'undefined' )
-                        parse_attrs[cond_field_id] = {};
-
-                    parse_attrs[cond_field_id][cond_field_attr] = attribute.value;
-                }
-            });
-
-            jQuery.each( parse_attrs, function ( ii, dd ) {
-                var obj = {'field' :{
-                    owner: key,
-                    action: dd.action,
-                    parent: dd.field,
-                    operator: dd.operator,
-                    value: dd.value,
-                    condition: {
-                        owner: key,
-                        action: dd.action,
-                        operator: dd.operator,
-                        value: dd.value
-                    }
-                }};
-
-                arr_all_conditions.push(obj);
-            });
-
-            um_field_default_values[jQuery(this).data('key')] = um_get_field_default_value( jQuery(this) );
-        });
-
-        jQuery.each( arr_field_keys, function ( i, field_key ) {
-            um_field_conditions[field_key] = um_get_field_children( field_key );
-        });
-
-        jQuery( '.um-field[data-key]:visible' ).each( function() {
-            var $wrap_dom = jQuery(this);
-            var me = um_get_field_element( $wrap_dom );
-            if ( typeof me.trigger !== 'undefined' ) {
-                me.trigger( 'change' );
-            }
-        });
-
-    }
-
-
     um_init_field_conditions();
 });
\ No newline at end of file
diff --git a/assets/js/um-conditional.min.js b/assets/js/um-conditional.min.js
index 4b9c8602..d730672f 100644
--- a/assets/js/um-conditional.min.js
+++ b/assets/js/um-conditional.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(){var e,t=[],d={},o={};function r(e){switch(s(e)){case"text":case"number":case"date":case"textarea":case"select":case"multiselect":case"radio":case"checkbox":return e.find("input,textarea,select")}return""}function s(e){var n="",i=e.attr("class");return jQuery.each(i.split(" "),function(e,i){-1!=i.indexOf("um-field-type")&&(n=i.split("_")[1])}),n}function l(e,i,n){var a,t=!1;n=!!n;for(a in i)if(n&&i[a]===e||!n&&i[a]==e){t=!0;break}return t}function i(n,e){var i,a=n.parents(".um-field[data-key]").data("key"),t=d[a],c=(i=n,um_live_field=i.parents(".um-field").data("key"),um_live_value=i.val(),i.is(":checkbox")&&(um_live_value="",1<i.parents(".um-field").find("input:checked").length?i.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=i.parents(".um-field").find("input:checked").length&&(um_live_value=i.parents(".um-field").find("input:checked").val())),i.is(":radio")&&(um_live_value=i.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value),o={},r={},u={};jQuery.each(t,function(e,i){void 0===r[i.owner]&&(r[i.owner]=[],u[i.owner]={}),r[i.owner].push(i.value),u[i.owner]=i}),jQuery.each(t,function(e,i){void 0===o[i.owner]&&(o[i.owner]={}),"empty"==i.operator&&(!c||""==c&&l(c,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1),"not empty"==i.operator&&(c&&""!=c&&!l(c,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1),"equals to"==i.operator&&(i.value==c&&l(c,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1),"not equals"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(c)!=parseInt(i.value)&&c&&!l(c,r[i.owner])?o[i.owner][e]=!0:i.value==c||l(c,r[i.owner])?o[i.owner][e]=!1:o[i.owner][e]=!0),"greater than"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(c)>parseInt(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1),"less than"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(c)<parseInt(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1),"contains"==i.operator&&("multiselect"==s(n.parents(".um-field[data-key]"))?c&&0<=c.indexOf(i.value)&&l(i.value,c)?o[i.owner][e]=!0:o[i.owner][e]=!1:"checkbox"==s(n.parents(".um-field[data-key]"))?c&&0<=c.indexOf(i.value)?o[i.owner][e]=!0:o[i.owner][e]=!1:c&&0<=c.indexOf(i.value)&&l(c,r[i.owner])?o[i.owner][e]=!0:o[i.owner][e]=!1)}),jQuery.each(o,function(e,i){l(!0,i)?f(n,u[e],!0):f(n,u[e],!1)}),n.trigger("um_fields_change")}function f(e,i,n){var a=jQuery('div.um-field[data-key="'+i.owner+'"]');"show"==i.action&&n&&(a.show(),h(a),c(a)),"show"!=i.action||n||(a.hide(),u(a)),"hide"==i.action&&n&&(a.hide(),u(a)),"hide"!=i.action||n||(a.show(),h(a),c(a)),e.removeClass("um-field-has-changed")}function c(a){var e=s(a),i=a.data("key"),n=o[i];switch(e){case"text":case"number":case"date":case"textarea":a.find("input:text,input[type=number],textareas").val(n.value);break;case"select":a.find("select").find("option").prop("selected",!1),a.find("select").val(n.value),a.find("select").trigger("change");break;case"multiselect":a.find("select").find("option").prop("selected",!1),jQuery.each(n.value,function(e,i){a.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),a.find("select").trigger("change");break;case"checkbox":if(1<=a.find("input[type=checkbox]:checked").length)if(a.find("input[type=checkbox]:checked").removeAttr("checked"),a.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),a.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),a.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(n.value))jQuery.each(n.value,function(e,i){var n=a.find('input[type=checkbox][value="'+i+'"]');n.attr("checked",!0),n.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),n.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),n.closest(".um-field-checkbox").addClass("active")});else{var t=a.find('input[type=checkbox][value="'+n.value+'"]');t.attr("checked",!0),t.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),t.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),t.closest(".um-field-checkbox").addClass("active")}break;case"radio":1<=a.find("input[type=radio]:checked").length&&setTimeout(function(){a.find("input[type=radio]:checked").removeAttr("checked"),a.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),a.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),a.find(".um-field-radio.active").removeClass("active");var e=a.find("input[type=radio][value='"+n.value+"']");e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100)}if(!a.hasClass("um-field-has-changed")){var c=r(a);"radio"!=e&&"checkbox"!=e||(c=c.find(":checked")),c&&(c.trigger("change"),a.addClass("um-field-has-changed"))}}function n(){jQuery.each(d,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"==jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function u(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function h(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){i(jQuery(this))}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){i(jQuery(this))}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){i(jQuery(this))}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){i(jQuery(this))}),jQuery(document).on("um_fields_change",function(){n(),n()}),e=[],jQuery(".um-field[data-key]").each(function(){var a=jQuery(this).data("key");e.push(a);var c={};jQuery.each(jQuery(this)[0].attributes,function(e,i){if(-1!=i.name.indexOf("data-cond")){var n=i.name.slice(10),a=n.substring(1,0),t=n.slice(2);void 0===c[a]&&(c[a]={}),c[a][t]=i.value}}),jQuery.each(c,function(e,i){var n={field:{owner:a,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:a,action:i.action,operator:i.operator,value:i.value}}};t.push(n)}),o[jQuery(this).data("key")]=function(e){var i="",n=s(e);switch(n){case"text":case"number":case"date":case"textarea":case"select":i=e.find("input:text,input[type=number],textarea,select").val();break;case"multiselect":i=e.find("select").val();break;case"radio":1<=e.find("input[type=radio]:checked").length&&(i=e.find("input[type=radio]:checked").val());break;case"checkbox":1<=e.find("input[type=checkbox]:checked").length&&(1<e.find("input[type=checkbox]:checked").length?e.find("input[type=checkbox]:checked").each(function(){i=i+jQuery(this).val()+" "}):i=e.find("input[type=checkbox]:checked").val())}return{type:n,value:i}}(jQuery(this))}),jQuery.each(e,function(e,i){var n,a;d[i]=(n=i,a=[],jQuery.each(t,function(e,i){i.field.parent==n&&a.push(i.field.condition)}),a)}),jQuery(".um-field[data-key]:visible").each(function(){var e=r(jQuery(this));void 0!==e.trigger&&e.trigger("change")})});
\ No newline at end of file
+var arr_all_conditions=[],um_field_conditions={},um_field_default_values={};function um_get_field_default_value(e){var i="",n=um_get_field_type(e);switch(n){case"text":case"number":case"date":case"textarea":case"select":i=e.find("input:text,input[type=number],textarea,select").val();break;case"multiselect":i=e.find("select").val();break;case"radio":1<=e.find("input[type=radio]:checked").length&&(i=e.find("input[type=radio]:checked").val());break;case"checkbox":1<=e.find("input[type=checkbox]:checked").length&&(1<e.find("input[type=checkbox]:checked").length?e.find("input[type=checkbox]:checked").each(function(){i=i+jQuery(this).val()+" "}):i=e.find("input[type=checkbox]:checked").val())}return{type:n,value:i}}function um_get_field_element(e){switch(um_get_field_type(e)){case"text":case"number":case"date":case"textarea":case"select":case"multiselect":case"radio":case"checkbox":return e.find("input,textarea,select")}return""}function um_get_field_type(e){var n="",i=e.attr("class");return jQuery.each(i.split(" "),function(e,i){-1!=i.indexOf("um-field-type")&&(n=i.split("_")[1])}),n}function um_get_field_children(n){var t=[];return jQuery.each(arr_all_conditions,function(e,i){i.field.parent==n&&t.push(i.field.condition)}),t}function um_splitup_array(e,i){for(var n=e.length%i,t=n,a=Math.floor(e.length/i),u=[],o=0;o<e.length;o+=a){var r=a+o,d=!1;0!==n&&t&&(r++,t--,d=!0),u.push(e.slice(o,r)),d&&o++}var c=[];return jQuery.each(u,function(e,i){c.push({action:i[0],if_field:i[1],operator:i[2],value:i[3]})}),c}function um_get_field_data(e){return um_live_field=e.parents(".um-field").data("key"),um_live_value=e.val(),e.is(":checkbox")&&(um_live_value="",1<e.parents(".um-field").find("input:checked").length?e.parents(".um-field").find("input:checked").each(function(){um_live_value=um_live_value+jQuery(this).val()+" "}):1<=e.parents(".um-field").find("input:checked").length&&(um_live_value=e.parents(".um-field").find("input:checked").val())),e.is(":radio")&&(um_live_value=e.parents(".um-field").find("input[type=radio]:checked").val()),um_live_value}function um_in_array(e,i,n){var t,a=!1;n=!!n;for(t in i)if(n&&i[t]===e||!n&&i[t]==e){a=!0;break}return a}function um_apply_conditions(n,e){var i=n.parents(".um-field[data-key]").data("key"),t=um_field_conditions[i],a=um_get_field_data(n),u={},o={},r={};jQuery.each(t,function(e,i){void 0===o[i.owner]&&(o[i.owner]=[],r[i.owner]={}),o[i.owner].push(i.value),r[i.owner]=i}),jQuery.each(t,function(e,i){void 0===u[i.owner]&&(u[i.owner]={}),"empty"==i.operator&&(!a||""==a&&um_in_array(a,o[i.owner])?u[i.owner][e]=!0:u[i.owner][e]=!1),"not empty"==i.operator&&(a&&""!=a&&!um_in_array(a,o[i.owner])?u[i.owner][e]=!0:u[i.owner][e]=!1),"equals to"==i.operator&&(i.value==a&&um_in_array(a,o[i.owner])?u[i.owner][e]=!0:u[i.owner][e]=!1),"not equals"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(a)!=parseInt(i.value)&&a&&!um_in_array(a,o[i.owner])?u[i.owner][e]=!0:i.value==a||um_in_array(a,o[i.owner])?u[i.owner][e]=!1:u[i.owner][e]=!0),"greater than"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(a)>parseInt(i.value)?u[i.owner][e]=!0:u[i.owner][e]=!1),"less than"==i.operator&&(jQuery.isNumeric(i.value)&&parseInt(a)<parseInt(i.value)?u[i.owner][e]=!0:u[i.owner][e]=!1),"contains"==i.operator&&("multiselect"==um_get_field_type(n.parents(".um-field[data-key]"))?a&&0<=a.indexOf(i.value)&&um_in_array(i.value,a)?u[i.owner][e]=!0:u[i.owner][e]=!1:"checkbox"==um_get_field_type(n.parents(".um-field[data-key]"))?a&&0<=a.indexOf(i.value)?u[i.owner][e]=!0:u[i.owner][e]=!1:a&&0<=a.indexOf(i.value)&&um_in_array(a,o[i.owner])?u[i.owner][e]=!0:u[i.owner][e]=!1)}),jQuery.each(u,function(e,i){um_in_array(!0,i)?um_field_apply_action(n,r[e],!0):um_field_apply_action(n,r[e],!1)}),n.trigger("um_fields_change")}function um_field_apply_action(e,i,n){var t=jQuery('div.um-field[data-key="'+i.owner+'"]');"show"==i.action&&n&&(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),"show"!=i.action||n||(t.hide(),_hide_in_ie(t)),"hide"==i.action&&n&&(t.hide(),_hide_in_ie(t)),"hide"!=i.action||n||(t.show(),_show_in_ie(t),um_field_restore_default_value(t)),e.removeClass("um-field-has-changed")}function um_field_restore_default_value(t){var e=um_get_field_type(t),i=t.data("key"),n=um_field_default_values[i];switch(e){case"text":case"number":case"date":case"textarea":t.find("input:text,input[type=number],textareas").val(n.value);break;case"select":t.find("select").find("option").prop("selected",!1),t.find("select").val(n.value),t.find("select").trigger("change");break;case"multiselect":t.find("select").find("option").prop("selected",!1),jQuery.each(n.value,function(e,i){t.find("select").find('option[value="'+i+'"]').attr("selected",!0)}),t.find("select").trigger("change");break;case"checkbox":if(1<=t.find("input[type=checkbox]:checked").length)if(t.find("input[type=checkbox]:checked").removeAttr("checked"),t.find("span.um-field-checkbox-state i").removeClass("um-icon-android-checkbox-outline"),t.find("span.um-field-checkbox-state i").addClass("um-icon-android-checkbox-outline-blank"),t.find(".um-field-checkbox.active").removeClass("active"),jQuery.isArray(n.value))jQuery.each(n.value,function(e,i){var n=t.find('input[type=checkbox][value="'+i+'"]');n.attr("checked",!0),n.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),n.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),n.closest(".um-field-checkbox").addClass("active")});else{var a=t.find('input[type=checkbox][value="'+n.value+'"]');a.attr("checked",!0),a.closest(".um-field-checkbox").find("i").removeClass("um-icon-android-checkbox-outline-blank"),a.closest(".um-field-checkbox").find("i").addClass("um-icon-android-checkbox-outline"),a.closest(".um-field-checkbox").addClass("active")}break;case"radio":1<=t.find("input[type=radio]:checked").length&&setTimeout(function(){t.find("input[type=radio]:checked").removeAttr("checked"),t.find("span.um-field-radio-state i").removeClass("um-icon-android-radio-button-on"),t.find("span.um-field-radio-state i").addClass("um-icon-android-radio-button-off"),t.find(".um-field-radio.active").removeClass("active");var e=t.find("input[type=radio][value='"+n.value+"']");e.attr("checked",!0),e.closest(".um-field-radio").find("i").removeClass("um-icon-android-radio-button-off"),e.closest(".um-field-radio").find("i").addClass("um-icon-android-radio-button-on"),e.closest(".um-field-radio").addClass("active")},100)}if(!t.hasClass("um-field-has-changed")){var u=um_get_field_element(t);"radio"!=e&&"checkbox"!=e||(u=u.find(":checked")),u&&(u.trigger("change"),t.addClass("um-field-has-changed"))}}function um_field_hide_siblings(){jQuery.each(um_field_conditions,function(e,i){(1<=jQuery('.um-field[data-key="'+e+'"]:hidden').length||"none"==jQuery('.um-field[data-key="'+e+'"]').css("display"))&&jQuery.each(i,function(e,i){jQuery('.um-field[data-key="'+i.owner+'"]').hide()})})}function _hide_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"hidden"})}function _show_in_ie(e){void 0!==jQuery.browser&&jQuery.browser.msie&&e.css({visibility:"visible"})}function um_init_field_conditions(){var e=[];jQuery(".um-field[data-key]").each(function(){var t=jQuery(this).data("key");e.push(t);var u={};jQuery.each(jQuery(this)[0].attributes,function(e,i){if(-1!=i.name.indexOf("data-cond")){var n=i.name.slice(10),t=n.substring(1,0),a=n.slice(2);void 0===u[t]&&(u[t]={}),u[t][a]=i.value}}),jQuery.each(u,function(e,i){var n={field:{owner:t,action:i.action,parent:i.field,operator:i.operator,value:i.value,condition:{owner:t,action:i.action,operator:i.operator,value:i.value}}};arr_all_conditions.push(n)}),um_field_default_values[jQuery(this).data("key")]=um_get_field_default_value(jQuery(this))}),jQuery.each(e,function(e,i){um_field_conditions[i]=um_get_field_children(i)}),jQuery(".um-field[data-key]:visible").each(function(){var e=um_get_field_element(jQuery(this));void 0!==e.trigger&&e.trigger("change")})}jQuery(document).ready(function(){jQuery(document).on("change",'.um-field select, .um-field input[type="radio"], .um-field input[type="checkbox"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="text"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="number"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("input change",'.um-field input[type="password"]',function(){um_apply_conditions(jQuery(this),!1)}),jQuery(document).on("um_fields_change",function(){um_field_hide_siblings(),um_field_hide_siblings()}),um_init_field_conditions()});
\ No newline at end of file
diff --git a/assets/js/um-scripts.js b/assets/js/um-scripts.js
index 0be9ab66..8d7f1289 100644
--- a/assets/js/um-scripts.js
+++ b/assets/js/um-scripts.js
@@ -124,10 +124,10 @@ jQuery(document).ready(function() {
         score: 		function() {return jQuery(this).attr('data-score');},
         scoreName: 	function(){return jQuery(this).attr('data-key');},
         hints: 		false,
-        click: function(score, evt) {
+        click: function( score, evt ) {
             live_field = this.id;
             live_value = score;
-            um_conditional();
+	        um_apply_conditions( jQuery(this), false );
         }
     });
 
diff --git a/assets/js/um-scripts.min.js b/assets/js/um-scripts.min.js
index 82a00880..b72941b1 100644
--- a/assets/js/um-scripts.min.js
+++ b/assets/js/um-scripts.min.js
@@ -1 +1 @@
-jQuery(document).ready(function(){jQuery(document).on("click",".um-dropdown a",function(e){return!1}),jQuery(document).on("click",".um-dropdown a.real_url",function(e){window.location=jQuery(this).attr("href")}),jQuery(document).on("click",".um-trigger-menu-on-click",function(e){return jQuery(".um-dropdown").hide(),menu=jQuery(this).find(".um-dropdown"),menu.show(),!1}),jQuery(document).on("click",".um-dropdown-hide",function(e){UM_hide_menus()}),jQuery(document).on("click","a.um-manual-trigger",function(){var e=jQuery(this).attr("data-child"),t=jQuery(this).attr("data-parent");jQuery(this).parents(t).find(e).trigger("click")}),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}),jQuery(document).on("change",".um-field-area input[type=radio]",function(){var e=jQuery(this).parents(".um-field-area"),t=jQuery(this).parents("label");e.find(".um-field-radio").removeClass("active"),e.find(".um-field-radio").find("i").removeAttr("class").addClass("um-icon-android-radio-button-off"),t.addClass("active"),t.find("i").removeAttr("class").addClass("um-icon-android-radio-button-on")}),jQuery(document).on("change",".um-field-area input[type=checkbox]",function(){jQuery(this).parents(".um-field-area");var e=jQuery(this).parents("label");e.hasClass("active")?(e.removeClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline-blank")):(e.addClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline"))}),jQuery(".um-datepicker").each(function(){if(elem=jQuery(this),""!=elem.attr("data-disabled_weekdays"))var e=JSON.parse(elem.attr("data-disabled_weekdays"));else e=!1;var t=elem.attr("data-years"),a=elem.attr("data-date_min"),i=elem.attr("data-date_max"),r=a.split(","),n=i.split(","),u=r.length?new Date(r):null,o=r.length?new Date(n):null;if(u&&"Invalid Date"==u.toString()&&3==r.length){var d=r[1]+"/"+r[2]+"/"+r[0];u=new Date(Date.parse(d))}if(o&&"Invalid Date"==o.toString()&&3==n.length){var s=n[1]+"/"+n[2]+"/"+n[0];o=new Date(Date.parse(s))}elem.pickadate({selectYears:t,min:u,max:o,disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})}),jQuery(".um-timepicker").each(function(){elem=jQuery(this),elem.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(".um-rating").um_raty({half:!1,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:!1,click:function(e,t){live_field=this.id,live_value=e,um_conditional()}}),jQuery(".um-rating-readonly").um_raty({half:!1,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:!1,readOnly:!0}),jQuery(document).on("click",".um .um-single-image-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-image-preview img").attr("src");return t.find(".um-single-image-preview img").attr("src",""),t.find(".um-single-image-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a}}),!1}),jQuery(document).on("click",".um .um-single-file-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-fileinfo a").attr("href");return t.find(".um-single-file-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a}}),!1}),jQuery(".um-s1,.um-s2").css({display:"block"}),jQuery(".um-s1").select2({allowClear:!0}),jQuery(".um-s2").select2({allowClear:!1,minimumResultsForSearch:10}),jQuery(document).on("click",".um-field-group-head:not(.disabled)",function(){var e=jQuery(this).parents(".um-field-group"),t=e.data("max_entries");e.find(".um-field-group-body").is(":hidden")?e.find(".um-field-group-body").show():e.find(".um-field-group-body:first").clone().appendTo(e),increase_id=0,e.find(".um-field-group-body").each(function(){increase_id++,jQuery(this).find("input").each(function(){var e=jQuery(this);e.attr("id",e.data("key")+"-"+increase_id),e.attr("name",e.data("key")+"-"+increase_id),e.parent().parent().find("label").attr("for",e.data("key")+"-"+increase_id)})}),0<t&&e.find(".um-field-group-body").length==t&&jQuery(this).addClass("disabled")}),jQuery(document).on("click",".um-field-group-cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field-group"),a=t.data("max_entries");return 1<t.find(".um-field-group-body").length?jQuery(this).parents(".um-field-group-body").remove():jQuery(this).parents(".um-field-group-body").hide(),0<a&&t.find(".um-field-group-body").length<a&&t.find(".um-field-group-head").removeClass("disabled"),!1}),jQuery(document.body).on("click",".um-ajax-paginate",function(e){e.preventDefault();var t=jQuery(this),a=jQuery(this).parent();a.addClass("loading");var i=jQuery(this).data("hook");if("um_load_posts"===i){var r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_posts",author:jQuery(this).data("author"),page:n},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else{var u=jQuery(this).data("args"),o=jQuery(this).parents(".um").find(".um-ajax-items");jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate",hook:i,args:u},complete:function(){a.removeClass("loading")},success:function(e){a.remove(),o.append(e)}})}}),jQuery(document).on("click",".um-ajax-action",function(e){e.preventDefault();var t=jQuery(this).data("hook"),a=jQuery(this).data("user_id"),arguments=jQuery(this).data("arguments");return jQuery(this).data("js-remove")&&jQuery(this).parents("."+jQuery(this).data("js-remove")).fadeOut("fast"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_muted_action",hook:t,user_id:a,arguments:arguments},success:function(e){}}),!1}),jQuery(document).on("click","#um-search-button",function(){jQuery(this).parents("form").submit()}),jQuery(".um-form input[class=um-button][type=submit]").removeAttr("disabled"),jQuery(document).one("click",".um:not(.um-account) .um-form input[class=um-button][type=submit]:not(.um-has-recaptcha)",function(){jQuery(this).attr("disabled","disabled"),jQuery(this).parents("form").submit()});var o={};function d(e,t,a,i){var r=e.data("um-parent");e.attr("name"),jQuery('select[name="'+r+'"]');e.find('option[value!=""]').remove(),e.hasClass("um-child-option-disabled")||e.removeAttr("disabled");i=[];var n="";if("yes"===t.post.members_directory){var u=new URLSearchParams(window.location.search);n=u.get(t.post.child_name)}jQuery.each(t.items,function(e,t){i.push({id:e,text:t,selected:t===n})}),e.select2("destroy"),e.select2({data:i,allowClear:!0,minimumResultsForSearch:10}),"yes"!==t.post.members_directory&&(void 0===t.field.default||e.data("um-original-value")?""!=e.data("um-original-value")&&e.val(e.data("um-original-value")).trigger("change"):e.val(t.field.default).trigger("change"),0==t.field.editable&&(e.addClass("um-child-option-disabled"),e.attr("disabled","disabled"))),o[a]=t}jQuery("select[data-um-parent]").each(function(){var r=jQuery(this),n=r.data("um-parent"),u=(r.data("um-ajax-url"),r.data("um-ajax-source"));r.val();r.attr("data-um-init-field",!0),jQuery(document).on("change",'select[name="'+n+'"]',function(){var t=jQuery(this),e=t.closest("form").find("input[type=hidden][name=form_id]").val(),a=t.val();if(""!=t.val()&&"object"!=typeof o[a]&&jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_select_options",parent_option_name:n,parent_option:t.val(),child_callback:u,child_name:r.attr("name"),members_directory:r.attr("data-mebers-directory"),form_id:e},success:function(e){"success"==e.status&&""!=t.val()&&d(r,e,a),void 0!==e.debug&&console.log(e)},error:function(e){console.log(e)}}),""!=t.val()&&"object"==typeof o[a]){var i=o[a];d(r,i,a)}""==t.val()&&(r.find('option[value!=""]').remove(),r.val("").trigger("change"))}),jQuery('select[name="'+n+'"]').trigger("change")})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(document).on("click",".um-dropdown a",function(e){return!1}),jQuery(document).on("click",".um-dropdown a.real_url",function(e){window.location=jQuery(this).attr("href")}),jQuery(document).on("click",".um-trigger-menu-on-click",function(e){return jQuery(".um-dropdown").hide(),menu=jQuery(this).find(".um-dropdown"),menu.show(),!1}),jQuery(document).on("click",".um-dropdown-hide",function(e){UM_hide_menus()}),jQuery(document).on("click","a.um-manual-trigger",function(){var e=jQuery(this).attr("data-child"),t=jQuery(this).attr("data-parent");jQuery(this).parents(t).find(e).trigger("click")}),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}),jQuery(document).on("change",".um-field-area input[type=radio]",function(){var e=jQuery(this).parents(".um-field-area"),t=jQuery(this).parents("label");e.find(".um-field-radio").removeClass("active"),e.find(".um-field-radio").find("i").removeAttr("class").addClass("um-icon-android-radio-button-off"),t.addClass("active"),t.find("i").removeAttr("class").addClass("um-icon-android-radio-button-on")}),jQuery(document).on("change",".um-field-area input[type=checkbox]",function(){jQuery(this).parents(".um-field-area");var e=jQuery(this).parents("label");e.hasClass("active")?(e.removeClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline-blank")):(e.addClass("active"),e.find("i").removeAttr("class").addClass("um-icon-android-checkbox-outline"))}),jQuery(".um-datepicker").each(function(){if(elem=jQuery(this),""!=elem.attr("data-disabled_weekdays"))var e=JSON.parse(elem.attr("data-disabled_weekdays"));else e=!1;var t=elem.attr("data-years"),a=elem.attr("data-date_min"),i=elem.attr("data-date_max"),r=a.split(","),n=i.split(","),u=r.length?new Date(r):null,o=r.length?new Date(n):null;if(u&&"Invalid Date"==u.toString()&&3==r.length){var d=r[1]+"/"+r[2]+"/"+r[0];u=new Date(Date.parse(d))}if(o&&"Invalid Date"==o.toString()&&3==n.length){var s=n[1]+"/"+n[2]+"/"+n[0];o=new Date(Date.parse(s))}elem.pickadate({selectYears:t,min:u,max:o,disable:e,format:elem.attr("data-format"),formatSubmit:"yyyy/mm/dd",hiddenName:!0,onOpen:function(){elem.blur()},onClose:function(){elem.blur()}})}),jQuery(".um-timepicker").each(function(){elem=jQuery(this),elem.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(".um-rating").um_raty({half:!1,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:!1,click:function(e,t){live_field=this.id,live_value=e,um_apply_conditions(jQuery(this),!1)}}),jQuery(".um-rating-readonly").um_raty({half:!1,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:!1,readOnly:!0}),jQuery(document).on("click",".um .um-single-image-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-image-preview img").attr("src");return t.find(".um-single-image-preview img").attr("src",""),t.find(".um-single-image-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a}}),!1}),jQuery(document).on("click",".um .um-single-file-preview a.cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field"),a=jQuery(this).parents(".um-field").find(".um-single-fileinfo a").attr("href");return t.find(".um-single-file-preview").hide(),t.find(".um-btn-auto-width").html("Upload"),t.find("input[type=hidden]").val("empty_file"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_remove_file",src:a}}),!1}),jQuery(".um-s1,.um-s2").css({display:"block"}),jQuery(".um-s1").select2({allowClear:!0}),jQuery(".um-s2").select2({allowClear:!1,minimumResultsForSearch:10}),jQuery(document).on("click",".um-field-group-head:not(.disabled)",function(){var e=jQuery(this).parents(".um-field-group"),t=e.data("max_entries");e.find(".um-field-group-body").is(":hidden")?e.find(".um-field-group-body").show():e.find(".um-field-group-body:first").clone().appendTo(e),increase_id=0,e.find(".um-field-group-body").each(function(){increase_id++,jQuery(this).find("input").each(function(){var e=jQuery(this);e.attr("id",e.data("key")+"-"+increase_id),e.attr("name",e.data("key")+"-"+increase_id),e.parent().parent().find("label").attr("for",e.data("key")+"-"+increase_id)})}),0<t&&e.find(".um-field-group-body").length==t&&jQuery(this).addClass("disabled")}),jQuery(document).on("click",".um-field-group-cancel",function(e){e.preventDefault();var t=jQuery(this).parents(".um-field-group"),a=t.data("max_entries");return 1<t.find(".um-field-group-body").length?jQuery(this).parents(".um-field-group-body").remove():jQuery(this).parents(".um-field-group-body").hide(),0<a&&t.find(".um-field-group-body").length<a&&t.find(".um-field-group-head").removeClass("disabled"),!1}),jQuery(document.body).on("click",".um-ajax-paginate",function(e){e.preventDefault();var t=jQuery(this),a=jQuery(this).parent();a.addClass("loading");var i=jQuery(this).data("hook");if("um_load_posts"===i){var r=1*jQuery(this).data("pages"),n=1*jQuery(this).data("page")+1;jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate_posts",author:jQuery(this).data("author"),page:n},complete:function(){a.removeClass("loading")},success:function(e){a.before(e),n===r?a.remove():t.data("page",n)}})}else{var u=jQuery(this).data("args"),o=jQuery(this).parents(".um").find(".um-ajax-items");jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_ajax_paginate",hook:i,args:u},complete:function(){a.removeClass("loading")},success:function(e){a.remove(),o.append(e)}})}}),jQuery(document).on("click",".um-ajax-action",function(e){e.preventDefault();var t=jQuery(this).data("hook"),a=jQuery(this).data("user_id"),arguments=jQuery(this).data("arguments");return jQuery(this).data("js-remove")&&jQuery(this).parents("."+jQuery(this).data("js-remove")).fadeOut("fast"),jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_muted_action",hook:t,user_id:a,arguments:arguments},success:function(e){}}),!1}),jQuery(document).on("click","#um-search-button",function(){jQuery(this).parents("form").submit()}),jQuery(".um-form input[class=um-button][type=submit]").removeAttr("disabled"),jQuery(document).one("click",".um:not(.um-account) .um-form input[class=um-button][type=submit]:not(.um-has-recaptcha)",function(){jQuery(this).attr("disabled","disabled"),jQuery(this).parents("form").submit()});var o={};function d(e,t,a,i){var r=e.data("um-parent");e.attr("name"),jQuery('select[name="'+r+'"]');e.find('option[value!=""]').remove(),e.hasClass("um-child-option-disabled")||e.removeAttr("disabled");i=[];var n="";if("yes"===t.post.members_directory){var u=new URLSearchParams(window.location.search);n=u.get(t.post.child_name)}jQuery.each(t.items,function(e,t){i.push({id:e,text:t,selected:t===n})}),e.select2("destroy"),e.select2({data:i,allowClear:!0,minimumResultsForSearch:10}),"yes"!==t.post.members_directory&&(void 0===t.field.default||e.data("um-original-value")?""!=e.data("um-original-value")&&e.val(e.data("um-original-value")).trigger("change"):e.val(t.field.default).trigger("change"),0==t.field.editable&&(e.addClass("um-child-option-disabled"),e.attr("disabled","disabled"))),o[a]=t}jQuery("select[data-um-parent]").each(function(){var r=jQuery(this),n=r.data("um-parent"),u=(r.data("um-ajax-url"),r.data("um-ajax-source"));r.val();r.attr("data-um-init-field",!0),jQuery(document).on("change",'select[name="'+n+'"]',function(){var t=jQuery(this),e=t.closest("form").find("input[type=hidden][name=form_id]").val(),a=t.val();if(""!=t.val()&&"object"!=typeof o[a]&&jQuery.ajax({url:wp.ajax.settings.url,type:"post",data:{action:"um_select_options",parent_option_name:n,parent_option:t.val(),child_callback:u,child_name:r.attr("name"),members_directory:r.attr("data-mebers-directory"),form_id:e},success:function(e){"success"==e.status&&""!=t.val()&&d(r,e,a),void 0!==e.debug&&console.log(e)},error:function(e){console.log(e)}}),""!=t.val()&&"object"==typeof o[a]){var i=o[a];d(r,i,a)}""==t.val()&&(r.find('option[value!=""]').remove(),r.val("").trigger("change"))}),jQuery('select[name="'+n+'"]').trigger("change")})});
\ No newline at end of file
diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php
index e5102597..1ef61d0b 100644
--- a/includes/core/class-enqueue.php
+++ b/includes/core/class-enqueue.php
@@ -110,7 +110,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
 			wp_register_script('um_functions', $this->js_baseurl . 'um-functions' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util', 'um_scrollbar' ), ultimatemember_version, true );
 			wp_register_script( 'um-gdpr', $this->js_baseurl . 'um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false );
 			wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true );
-			wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util' ), ultimatemember_version, true );
+			wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional' ), ultimatemember_version, true );
 			/**
 			 * UM hook
 			 *
@@ -155,8 +155,8 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) {
 			wp_register_style( 'select2', $this->css_baseurl . 'select2/select2.min.css', array(), ultimatemember_version );
 			wp_register_style( 'um_fileupload', $this->css_baseurl . 'um-fileupload.css', array(), ultimatemember_version );
 			wp_register_style( 'um_datetime', $this->css_baseurl . 'pickadate/default.css', array(), ultimatemember_version );
-			wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um-datetime' ), ultimatemember_version );
-			wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um-datetime' ), ultimatemember_version );
+			wp_register_style( 'um_datetime_date', $this->css_baseurl . 'pickadate/default.date.css', array( 'um_datetime' ), ultimatemember_version );
+			wp_register_style( 'um_datetime_time', $this->css_baseurl . 'pickadate/default.time.css', array( 'um_datetime' ), ultimatemember_version );
 			wp_register_style( 'um_scrollbar', $this->css_baseurl . 'um-scrollbar.css', array(), ultimatemember_version );
 
 			wp_register_style( 'um_rtl', $this->css_baseurl . 'um.rtl.css', array(), ultimatemember_version );
diff --git a/includes/core/class-roles-capabilities.php b/includes/core/class-roles-capabilities.php
index adc9c2a8..580388b1 100644
--- a/includes/core/class-roles-capabilities.php
+++ b/includes/core/class-roles-capabilities.php
@@ -530,8 +530,11 @@ if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
 
 			$temp = array();
 			foreach ( $role_data as $key=>$value ) {
-				if ( strpos( $key, '_um_' ) === 0 )
-					$key = str_replace( '_um_', '', $key );
+				if ( strpos( $key, '_um_' ) === 0 ) {
+					$key = preg_replace('/_um_/', '', $key, 1);
+				}
+
+				//$key = str_replace( '_um_', '', $key, $count );
 				$temp[ $key ] = $value;
 			}
 
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index a642f814..8e7d5ef6 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2018-10-26 14:45+0300\n"
-"PO-Revision-Date: 2018-10-26 14:46+0300\n"
+"POT-Creation-Date: 2018-11-09 16:19+0200\n"
+"PO-Revision-Date: 2018-11-09 16:19+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -6195,48 +6195,42 @@ msgstr ""
 msgid "just now"
 msgstr ""
 
-#: includes/core/class-date-time.php:62
+#: includes/core/class-date-time.php:63
 #, php-format
 msgid "%s min"
-msgstr ""
+msgid_plural "%s mins"
+msgstr[0] ""
+msgstr[1] ""
 
-#: includes/core/class-date-time.php:64
-#, php-format
-msgid "%s mins"
-msgstr ""
-
-#: includes/core/class-date-time.php:73
+#: includes/core/class-date-time.php:72
 #, php-format
 msgid "%s hr"
-msgstr ""
+msgid_plural "%s hrs"
+msgstr[0] ""
+msgstr[1] ""
 
-#: includes/core/class-date-time.php:75
-#, php-format
-msgid "%s hrs"
-msgstr ""
-
-#: includes/core/class-date-time.php:84
+#: includes/core/class-date-time.php:82
 #, php-format
 msgid "Yesterday at %s"
 msgstr ""
 
-#: includes/core/class-date-time.php:86 includes/core/class-date-time.php:91
-#: includes/core/class-date-time.php:95 includes/core/class-date-time.php:99
+#: includes/core/class-date-time.php:84 includes/core/class-date-time.php:89
+#: includes/core/class-date-time.php:93 includes/core/class-date-time.php:97
 #, php-format
 msgid "%s at %s"
 msgstr ""
 
-#: includes/core/class-date-time.php:148
+#: includes/core/class-date-time.php:146
 #, php-format
 msgid "%s year old"
 msgstr ""
 
-#: includes/core/class-date-time.php:151
+#: includes/core/class-date-time.php:149
 #, php-format
 msgid "%s years old"
 msgstr ""
 
-#: includes/core/class-date-time.php:154
+#: includes/core/class-date-time.php:152
 msgid "Less than 1 year old"
 msgstr ""
 
@@ -6313,7 +6307,7 @@ msgstr ""
 msgid "Upload File"
 msgstr ""
 
-#: includes/core/class-fields.php:2364 includes/core/um-filters-fields.php:243
+#: includes/core/class-fields.php:2364 includes/core/um-filters-fields.php:244
 msgid "This file has been removed."
 msgstr ""
 
@@ -6530,36 +6524,36 @@ msgid ""
 "\"{login_referrer}\">login</a> to view this content."
 msgstr ""
 
-#: includes/core/class-shortcodes.php:644
+#: includes/core/class-shortcodes.php:645
 msgid "You are already registered"
 msgstr ""
 
-#: includes/core/class-shortcodes.php:886
+#: includes/core/class-shortcodes.php:887
 msgid "Default Template"
 msgstr ""
 
-#: includes/core/class-uploader.php:648
+#: includes/core/class-uploader.php:654
 msgid "Your image is invalid!"
 msgstr ""
 
-#: includes/core/class-uploader.php:690
+#: includes/core/class-uploader.php:696
 msgid "This media type is not recognized."
 msgstr ""
 
-#: includes/core/class-uploader.php:738
+#: includes/core/class-uploader.php:744
 msgid "Your image is invalid or too large!"
 msgstr ""
 
-#: includes/core/class-uploader.php:744 includes/core/class-uploader.php:746
+#: includes/core/class-uploader.php:750 includes/core/class-uploader.php:752
 #, php-format
 msgid "Your photo is too small. It must be at least %spx wide."
 msgstr ""
 
-#: includes/core/class-uploader.php:799
+#: includes/core/class-uploader.php:805
 msgid "This file type is not recognized."
 msgstr ""
 
-#: includes/core/class-uploader.php:1065
+#: includes/core/class-uploader.php:1071
 #, php-format
 msgid "Maximum file size allowed: %s"
 msgstr ""
@@ -6950,12 +6944,7 @@ msgstr ""
 msgid "Joined %s"
 msgstr ""
 
-#: includes/core/um-filters-fields.php:133
-#, php-format
-msgid "Last login: %s"
-msgstr ""
-
-#: includes/core/um-filters-fields.php:274
+#: includes/core/um-filters-fields.php:275
 msgid "Untitled photo"
 msgstr ""