'+acf._e("relationship","loading")+"
");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.set("$field",t).render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.results||!e.results.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append(""+acf._e("relationship","empty")+"
"));var t=$(this.walker(e.results));this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.$choices.children(".list").append(t);var i="",a=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==i?(a.append($(this).siblings("ul").html()),void $(this).parent().remove()):(i=$(this).text(),void(a=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+=''+acf._e("relationship","loading")+"
");var a=$.ajax({url:acf.get("ajaxurl"),dataType:"json",type:"post",data:i,success:function(i){e.set("$field",t).render(i)}});this.$el.data("xhr",a)},render:function(e){if(this.$el.removeClass("is-loading is-empty"),this.$choices.find("p").remove(),!e||!e.results||!e.results.length)return this.$el.addClass("is-empty"),void(1==this.o.paged&&this.$choices.children(".list").append(""+acf._e("relationship","empty")+"
"));var t=$(this.walker(e.results));this.$values.find(".acf-rel-item").each(function(){t.find('.acf-rel-item[data-id="'+$(this).data("id")+'"]').addClass("disabled")}),this.$choices.children(".list").append(t);var i="",a=null;this.$choices.find(".acf-rel-label").each(function(){return $(this).text()==i?(a.append($(this).siblings("ul").html()),void $(this).parent().remove()):(i=$(this).text(),void(a=$(this).siblings("ul")))})},walker:function(e){var t="";if($.isArray(e))for(var i in e)t+=this.walker(e[i]);else $.isPlainObject(e)&&(void 0!==e.children?(t+='__('This is the name which will appear on the EDIT page','acf'), 'name' => 'label', 'type' => 'text', - 'required' => 1, 'class' => 'field-label' ), true); @@ -79,7 +78,6 @@ $atts['class'] = str_replace('_', '-', $atts['class']); 'instructions' => __('Single word, no spaces. Underscores and dashes allowed','acf'), 'name' => 'name', 'type' => 'text', - 'required' => 1, 'class' => 'field-name' ), true); @@ -88,7 +86,6 @@ $atts['class'] = str_replace('_', '-', $atts['class']); acf_render_field_setting($field, array( 'label' => __('Field Type','acf'), 'instructions' => '', - 'required' => 1, 'type' => 'select', 'name' => 'type', 'choices' => acf_get_field_types(), diff --git a/includes/api/api-field.php b/includes/api/api-field.php index 700a149..7c1ed32 100644 --- a/includes/api/api-field.php +++ b/includes/api/api-field.php @@ -284,7 +284,10 @@ function acf_get_field_label( $field ) { $label = $field['label']; - if( $field['required'] ) $label .= ' *'; + // required + if( $field['required'] ) { + $label .= ' *'; + } // filter for 3rd party customization @@ -413,23 +416,21 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) { if( !$field ) return; - // el - $elements = apply_filters('acf/render_field_wrap/elements', array( + // elements + $elements = array( 'div' => 'div', 'tr' => 'td', 'ul' => 'li', 'ol' => 'li', 'dl' => 'dt', 'td' => 'div' // special case for sub field! - )); + ); - // validate $el - if( !array_key_exists($el, $elements) ) { - - $el = 'div'; - - } + // vars + $el = isset($elements[ $el ]) ? $el : 'div'; + $el2 = $elements[ $el ]; + $show_label = ($el !== 'td') ? true : false; // wrapper @@ -446,9 +447,7 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) { // add required if( $field['required'] ) { - $wrapper['data-required'] = 1; - } @@ -493,7 +492,7 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) { if( $el == 'tr' || $el == 'td' ) { - $width = 0; + // do nothing } elseif( $width > 0 && $width < 100 ) { @@ -504,43 +503,87 @@ function acf_render_field_wrap( $field, $el = 'div', $instruction = 'label' ) { // remove empty attributes - foreach( $wrapper as $k => $v ) { + $wrapper = array_filter($wrapper); + + + // html + ?> +< > + + < class="acf-label"> + + + > + + < class="acf-input"> + + + + + + > +> +' . acf_esc_html($label) . ''; } +} + + +/** +* acf_render_field_wrap_description +* +* This function will maybe output the field's instructions +* +* @date 19/9/17 +* @since 5.6.3 +* +* @param array $field +* @return n/a +*/ + +function acf_the_field_wrap_instructions( $field ) { // vars - $show_label = ($el !== 'td') ? true : false; + $instructions = $field['instructions']; -?>< > - - < class="acf-label"> - - -
- - > - - < class="acf-input"> - - - - - > - - - -> -' . acf_esc_html($instructions) . ''; + + } } @@ -1243,7 +1286,7 @@ function acf_update_field( $field = false, $specific = false ) { // allow fields to contain the same name - add_filter( 'wp_unique_post_slug', 'acf_update_field_wp_unique_post_slug', 100, 6 ); + add_filter( 'wp_unique_post_slug', 'acf_update_field_wp_unique_post_slug', 999, 6 ); // slash data @@ -1691,7 +1734,7 @@ function acf_prepare_fields_for_import( $fields = false ) { // allow multiple fields to be returned ($field + $sub_fields) - if( acf_is_sequential_array($field) ) { + if( !isset($field['key']) && isset($field[0]) ) { // merge in $field (1 or more fields) array_splice($fields, $i, 1, $field); diff --git a/includes/api/api-helpers.php b/includes/api/api-helpers.php index 9197fee..998422f 100644 --- a/includes/api/api-helpers.php +++ b/includes/api/api-helpers.php @@ -538,7 +538,7 @@ function acf_nonce_input( $nonce = '' ) { function acf_extract_var( &$array, $key, $default = null ) { // check if exists - if( is_array($array) && array_key_exists($key, $array) ) { + if( is_array($array) && isset($array[ $key ]) ) { // store value $v = $array[ $key ]; diff --git a/includes/api/api-input.php b/includes/api/api-input.php index 73fd0a2..f7fd5de 100644 --- a/includes/api/api-input.php +++ b/includes/api/api-input.php @@ -30,6 +30,75 @@ function acf_esc_html( $string = '' ) { } +/** +* acf_clean_atts +* +* This function will remove empty attributes +* +* @date 3/10/17 +* @since 5.6.3 +* +* @param array $atts +* @return array +*/ + +function acf_clean_atts( $atts = array() ) { + + // loop + foreach( $atts as $k => $v ) { + if( $v === '' ) unset( $atts[ $k ] ); + } + + + // return + return $atts; +} + + +/** +* acf_get_atts +* +* This function will return an array of HTML attributes +* +* @date 2/10/17 +* @since 5.6.3 +* +* @param n/a +* @return n/a +*/ + +/* +function acf_get_atts( $array, $keys ) { + + // vars + $atts = array(); + + + // append attributes + foreach( $keys as $k ) { + if( isset($array[ $k ]) ) $atts[ $k ] = $array[ $k ]; + } + + + // modify special attributes + foreach( array('readonly', 'disabled', 'required') as $k ) { + $atts[ $k ] = $atts[ $k ] ? $k : ''; + } + + + // clean up blank attributes + foreach( $atts as $k => $v ) { + if( $v === '' ) unset( $atts[ $k ] ); + } + + + // return + return $atts; + +} +*/ + + /* * acf_esc_atts * @@ -241,8 +310,9 @@ function acf_textarea_input( $atts = array() ) { function acf_get_checkbox_input( $atts = array() ) { $label = acf_extract_var( $atts, 'label', '' ); + $checked = acf_maybe_get( $atts, 'checked', '' ); $atts['type'] = acf_maybe_get( $atts, 'type', 'checkbox' ); - return ''; + return '