diff --git a/cmb2-field-ajax-search.php b/cmb2-field-ajax-search.php
index 514e542..112d59e 100644
--- a/cmb2-field-ajax-search.php
+++ b/cmb2-field-ajax-search.php
@@ -27,7 +27,7 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
/**
* Current version number
*/
- const VERSION = '1.0.2';
+ const VERSION = '1.0.3';
/**
* Initialize the plugin by hooking into CMB2
@@ -46,7 +46,7 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
add_filter( 'cmb2_pre_field_display_term_ajax_search', array( $this, 'display' ), 10, 3 );
// Sanitize
- add_action( 'cmb2_sanitize_post_ajax_search', array( $this, 'sanitize' ), 10, 4 );
+ add_action( 'cmb2_sanitize_post_ajax_search', array( $this, 'sanitize' ), 10, 4 );
add_action( 'cmb2_sanitize_user_ajax_search', array( $this, 'sanitize' ), 10, 4 );
add_action( 'cmb2_sanitize_term_ajax_search', array( $this, 'sanitize' ), 10, 4 );
@@ -54,17 +54,25 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
add_action( 'wp_ajax_cmb_ajax_search_get_results', array( $this, 'get_results' ) );
}
+ public function convert_as_id_css( $name ) {
+ return str_replace( '__', '_', str_replace( '[', '_', str_replace( ']', '_', $name ) ) );
+ }
+
/**
* Render field
*/
public function render( $field, $value, $object_id, $object_type, $field_type ) {
- $field_name = $field->_name();
+ $field_name = $this->convert_as_id_css($field->_name());
$default_limit = 1;
// Current filter is cmb2_render_{$object_to_search}_ajax_search ( post, user or term )
$object_to_search = str_replace( 'cmb2_render_', '', str_replace( '_ajax_search', '', current_filter() ) );
- if( $field->args( 'multiple' ) == true ) {
+ if( ! is_array( $value ) && strpos( $value, ', ' ) ) {
+ $value = explode(', ', $value);
+ }
+
+ if( $field->args( 'multiple-item' ) == true ) {
$default_limit = -1; // 0 or -1 means unlimited
?>
-
args( 'sortable' ) ) : ?>
-
-
- object_text( $field_name, $val, $object_to_search ); ?>
+
+
+ object_text( $field->_name(), $val, $object_to_search ); ?>
@@ -98,7 +106,7 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
echo $field_type->input( array(
'type' => 'hidden',
- 'name' => $field_name,
+ 'name' => $field->_name(),
'value' => $value,
'desc' => false
) );
@@ -108,12 +116,12 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
echo $field_type->input( array(
'type' => 'text',
- 'name' => $field_name . '_input',
- 'id' => $field_name . '_input',
+ 'name' => '_' . $field->_name(),
+ 'id' => $field_name,
'class' => 'cmb-ajax-search cmb-' . $object_to_search . '-ajax-search',
'value' => $input_value,
'desc' => false,
- 'data-multiple' => $field->args( 'multiple' ) ? $field->args( 'multiple' ) : '0',
+ 'data-multiple' => $field->args( 'multiple-item' ) ? $field->args( 'multiple-item' ) : '0',
'data-limit' => $field->args( 'limit' ) ? $field->args( 'limit' ) : $default_limit,
'data-sortable' => $field->args( 'sortable' ) ? $field->args( 'sortable' ) : '0',
'data-object-type' => $object_to_search,
@@ -167,15 +175,16 @@ if( ! class_exists( 'CMB2_Field_Ajax_Search' ) ) {
* Optionally save the latitude/longitude values into two custom fields
*/
public function sanitize( $override_value, $value, $object_id, $field_args ) {
- $fid = $field_args['id'];
+ if ( !is_array( $value ) || !( array_key_exists('repeatable', $field_args ) && $field_args['repeatable'] == TRUE ) ) {
+ return $override_value;
+ }
- if($field_args['render_row_cb'][0]->data_to_save[$field_args['id']]) {
- $value = $field_args['render_row_cb'][0]->data_to_save[$field_args['id']];
- } else {
- $value = false;
- }
+ $new_values = array();
+ foreach ( $value as $key => $val ) {
+ $new_values[$key] = array_filter( array_map( 'sanitize_text_field', $val ) );
+ }
- return $value;
+ return array_filter( array_values( $new_values ) );
}
/**
diff --git a/js/ajax-search.js b/js/ajax-search.js
index 47d6dce..41de292 100644
--- a/js/ajax-search.js
+++ b/js/ajax-search.js
@@ -3,8 +3,7 @@
$('.cmb-ajax-search:not([data-ajax-search="true"])').each(function () {
$(this).attr('data-ajax-search', true);
- var input_id = $(this).attr('id'); // Field id with '_input' sufix (the searchable field)
- var field_id = $(this).attr('id').replace( new RegExp('_input$'), '' ); // Field id, the true one field
+ var field_id = $(this).attr('id').replace(/[\[\]']+/g, '_'); // Field id, the true one field
var object_type = $(this).attr('data-object-type');
var query_args = $(this).attr('data-query-args');
@@ -50,17 +49,18 @@
},
onSelect: function ( suggestion ) {
$(this).devbridgeAutocomplete('clearCache');
-
- var field_name = $(this).attr('id').replace( new RegExp('_input$'), '' );
+
+ var field_name = $(this).attr('name');
var multiple = $(this).attr('data-multiple');
var limit = parseInt( $(this).attr('data-limit') );
var sortable = $(this).attr('data-sortable');
-
+ var field_name_temp = field_name.substring(1).replace( /[\[\]']+/g, '_' );
+
if( multiple == 1 ) {
// Multiple
- $('#' + field_name + '_results' ).append( '- ' +
+ $('#' + field_name_temp + '_results' ).append( '
- ' +
( ( sortable == 1 ) ? '' : '' ) +
- '' +
+ '' +
'' + suggestion.value + '' +
'' +
'
' );
@@ -68,14 +68,14 @@
$(this).val( '' );
// Checks if there is the max allowed results, limit < 0 means unlimited
- if( limit > 0 && limit == $('#' + field_name + '_results li').length ) {
+ if( limit > 0 && limit == $('#' + field_name_temp + '_results li').length ) {
$(this).prop( 'disabled', 'disabled' );
} else {
$(this).focus();
}
} else {
// Singular
- $('input[name=' + field_name + ']').val( suggestion.id ).change();
+ $('input[name="' + field_name + '"]').val( suggestion.id ).change();
}
}
},
diff --git a/readme.md b/readme.md
index 6f5b4a0..55d6c5e 100644
--- a/readme.md
+++ b/readme.md
@@ -62,7 +62,7 @@ function cmb2_ajax_search_metabox() {
'desc' => __( 'Field description (optional)', 'cmb2' ),
'id' => $prefix . 'posts',
'type' => 'post_ajax_search',
- 'multiple' => true,
+ 'multiple-item' => true,
'limit' => 10,
'query_args' => array(
'post_type' => array( 'post', 'page' ),
@@ -88,7 +88,7 @@ function cmb2_ajax_search_metabox() {
'desc' => __( 'Field description (optional)', 'cmb2' ),
'id' => $prefix . 'users',
'type' => 'user_ajax_search',
- 'multiple' => true,
+ 'multiple-item' => true,
'limit' => 5,
'query_args' => array(
'role__not_in' => array( 'Administrator', 'Editor' ),
@@ -113,7 +113,7 @@ function cmb2_ajax_search_metabox() {
'desc' => __( 'Field description (optional)', 'cmb2' ),
'id' => $prefix . 'terms',
'type' => 'term_ajax_search',
- 'multiple' => true,
+ 'multiple-item' => true,
'limit' => -1,
'query_args' => array(
'taxonomy' => 'post_tag',
@@ -156,6 +156,12 @@ If multiple == true will return an array of IDs of attached object:
## Changelog
+### 1.0.3
+
+* Fixed issues with repeatable fields
+* Removed unused code
+* Moved to new paramenter `multiple-item` to avoid conflicts with CMB2
+
### 1.0.2
* Updated devbridgeAutocomplete lib