@@ -84,7 +84,6 @@ discard block |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * Fall back to CMB2_Types methods |
87 | - * @param string $field |
|
88 | 87 | * @throws Exception Throws an exception if the field is invalid. |
89 | 88 | * @return mixed |
90 | 89 | */ |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | * Magic getter for our object. |
106 | 105 | * @param string $field |
107 | 106 | * @throws Exception Throws an exception if the field is invalid. |
108 | - * @return mixed |
|
107 | + * @return CMB2_Field |
|
109 | 108 | */ |
110 | 109 | public function __get( $field ) { |
111 | 110 | switch ( $field ) { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function __construct( CMB2_Types $types, $args = array() ) { |
40 | 40 | $this->types = $types; |
41 | - $args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true; |
|
41 | + $args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true; |
|
42 | 42 | $this->args = $args; |
43 | 43 | } |
44 | 44 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @return string|CMB2_Type_Base Rendered output or this object. |
57 | 57 | */ |
58 | 58 | public function rendered( $rendered ) { |
59 | - if ( $this->args['rendered'] ) { |
|
59 | + if ( $this->args[ 'rendered' ] ) { |
|
60 | 60 | return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered; |
61 | 61 | } |
62 | 62 |
@@ -38,6 +38,9 @@ discard block |
||
38 | 38 | return $date_input . "\n" . $time_input; |
39 | 39 | } |
40 | 40 | |
41 | + /** |
|
42 | + * @param boolean $has_good_value |
|
43 | + */ |
|
41 | 44 | public function date_args( $args, $has_good_value ) { |
42 | 45 | $date_args = wp_parse_args( $args['datepicker'], array( |
43 | 46 | 'class' => 'cmb2-text-small cmb2-datepicker', |
@@ -51,6 +54,9 @@ discard block |
||
51 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
52 | 55 | } |
53 | 56 | |
57 | + /** |
|
58 | + * @param boolean $has_good_value |
|
59 | + */ |
|
54 | 60 | public function time_args( $args, $has_good_value ) { |
55 | 61 | $time_args = wp_parse_args( $args['timepicker'], array( |
56 | 62 | 'class' => 'cmb2-timepicker text-time', |
@@ -22,16 +22,16 @@ discard block |
||
22 | 22 | 'timepicker' => array(), |
23 | 23 | ) ); |
24 | 24 | |
25 | - if ( empty( $args['value'] ) ) { |
|
26 | - $args['value'] = $field->escaped_value(); |
|
25 | + if ( empty( $args[ 'value' ] ) ) { |
|
26 | + $args[ 'value' ] = $field->escaped_value(); |
|
27 | 27 | // This will be used if there is a select_timezone set for this field |
28 | 28 | $tz_offset = $field->field_timezone_offset(); |
29 | 29 | if ( ! empty( $tz_offset ) ) { |
30 | - $args['value'] -= $tz_offset; |
|
30 | + $args[ 'value' ] -= $tz_offset; |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | - $has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] ); |
|
34 | + $has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] ); |
|
35 | 35 | |
36 | 36 | $date_input = parent::render( $this->date_args( $args, $has_good_value ) ); |
37 | 37 | $time_input = parent::render( $this->time_args( $args, $has_good_value ) ); |
@@ -40,31 +40,31 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | public function date_args( $args, $has_good_value ) { |
43 | - $date_args = wp_parse_args( $args['datepicker'], array( |
|
43 | + $date_args = wp_parse_args( $args[ 'datepicker' ], array( |
|
44 | 44 | 'class' => 'cmb2-text-small cmb2-datepicker', |
45 | 45 | 'name' => $this->_name( '[date]' ), |
46 | 46 | 'id' => $this->_id( '_date' ), |
47 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '', |
|
47 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '', |
|
48 | 48 | 'desc' => '', |
49 | 49 | ) ); |
50 | 50 | |
51 | - $date_args['rendered'] = true; |
|
51 | + $date_args[ 'rendered' ] = true; |
|
52 | 52 | |
53 | 53 | // Let's get the date-format, and set it up as a data attr for the field. |
54 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
55 | 55 | } |
56 | 56 | |
57 | 57 | public function time_args( $args, $has_good_value ) { |
58 | - $time_args = wp_parse_args( $args['timepicker'], array( |
|
58 | + $time_args = wp_parse_args( $args[ 'timepicker' ], array( |
|
59 | 59 | 'class' => 'cmb2-timepicker text-time', |
60 | 60 | 'name' => $this->_name( '[time]' ), |
61 | 61 | 'id' => $this->_id( '_time' ), |
62 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '', |
|
63 | - 'desc' => $args['desc'], |
|
62 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '', |
|
63 | + 'desc' => $args[ 'desc' ], |
|
64 | 64 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ), |
65 | 65 | ) ); |
66 | 66 | |
67 | - $time_args['rendered'] = true; |
|
67 | + $time_args[ 'rendered' ] = true; |
|
68 | 68 | |
69 | 69 | // Let's get the time-format, and set it up as a data attr for the field. |
70 | 70 | return $this->parse_picker_options( 'time', $time_args ); |
@@ -15,7 +15,6 @@ |
||
15 | 15 | /** |
16 | 16 | * Handles outputting a 'wysiwyg' element |
17 | 17 | * @since 1.1.0 |
18 | - * @param array $args Override arguments |
|
19 | 18 | * @return string Form wysiwyg element |
20 | 19 | */ |
21 | 20 | public function render() { |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | ) ); |
29 | 29 | |
30 | 30 | if ( ! $field->group ) { |
31 | - return $this->rendered( $this->get_wp_editor( $a ) . $a['desc'] ); |
|
31 | + return $this->rendered( $this->get_wp_editor( $a ) . $a[ 'desc' ] ); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | // wysiwyg fields in a group need some special handling. |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | protected function get_wp_editor( $args ) { |
54 | 54 | ob_start(); |
55 | - wp_editor( $args['value'], $args['id'], $args['options'] ); |
|
55 | + wp_editor( $args[ 'value' ], $args[ 'id' ], $args[ 'options' ] ); |
|
56 | 56 | return ob_get_clean(); |
57 | 57 | } |
58 | 58 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $group_id = $this->field->group->id(); |
61 | 61 | $field_id = $this->field->id( true ); |
62 | 62 | $options = $this->field->options(); |
63 | - $options['textarea_name'] = 'cmb2_n_' . $group_id . $field_id; |
|
63 | + $options[ 'textarea_name' ] = 'cmb2_n_' . $group_id . $field_id; |
|
64 | 64 | |
65 | 65 | // Initate the editor with special id/value/name so we can retrieve the options in JS. |
66 | 66 | $editor = $this->get_wp_editor( array( |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | // And put the editor instance in a JS template wrapper. |
84 | 84 | echo '<script type="text/template" id="tmpl-cmb2-wysiwyg-' . $group_id . '-' . $field_id . '">'; |
85 | 85 | // Need to wrap the template in a wrapper div w/ specific data attributes which will be used when adding/removing rows. |
86 | - echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="'. $group_id .'" data-id="'. $field_id .'">'. $editor .'</div>'; |
|
86 | + echo '<div class="cmb2-wysiwyg-inner-wrap" data-iterator="{{ data.iterator }}" data-groupid="' . $group_id . '" data-id="' . $field_id . '">' . $editor . '</div>'; |
|
87 | 87 | echo '</script>'; |
88 | 88 | } |
89 | 89 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'data-objecttype' => $field->object_type, |
34 | 34 | ) ) |
35 | 35 | . '<p class="cmb-spinner spinner" style="display:none;"></p>' |
36 | - . '<div id="'. $this->_id( '-status' ). '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>'; |
|
36 | + . '<div id="' . $this->_id( '-status' ) . '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>'; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | } |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | public function render() { |
16 | 16 | |
17 | - $this->field->args['default'] = $this->field->get_default() |
|
17 | + $this->field->args[ 'default' ] = $this->field->get_default() |
|
18 | 18 | ? $this->field->get_default() |
19 | 19 | : cmb2_utils()->timezone_string(); |
20 | 20 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | ); |
37 | 37 | |
38 | 38 | if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) { |
39 | - $args['checked'] = 'checked'; |
|
39 | + $args[ 'checked' ] = 'checked'; |
|
40 | 40 | } |
41 | 41 | $options .= $this->types->list_input( $args, $i ); |
42 | 42 | $i++; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $field = $this->field; |
17 | 17 | $names = $this->get_object_terms(); |
18 | 18 | |
19 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $field->get_default() : $names[key( $names )]->slug; |
|
19 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $field->get_default() : $names[ key( $names ) ]->slug; |
|
20 | 20 | $terms = get_terms( $field->args( 'taxonomy' ), 'hide_empty=0' ); |
21 | 21 | $options = ''; |
22 | 22 | $i = 1; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | if ( ! $terms ) { |
25 | 25 | $options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->types->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) ); |
26 | 26 | } else { |
27 | - $option_none = $field->args( 'show_option_none' ); |
|
27 | + $option_none = $field->args( 'show_option_none' ); |
|
28 | 28 | if ( ! empty( $option_none ) ) { |
29 | 29 | |
30 | 30 | $field_id = $this->_id(); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'label' => $option_none, |
55 | 55 | ); |
56 | 56 | if ( $saved_term == $option_none_value ) { |
57 | - $args['checked'] = 'checked'; |
|
57 | + $args[ 'checked' ] = 'checked'; |
|
58 | 58 | } |
59 | 59 | $options .= $this->list_input( $args, $i ); |
60 | 60 | $i++; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ); |
68 | 68 | |
69 | 69 | if ( $saved_term == $term->slug ) { |
70 | - $args['checked'] = 'checked'; |
|
70 | + $args[ 'checked' ] = 'checked'; |
|
71 | 71 | } |
72 | 72 | $options .= $this->list_input( $args, $i ); |
73 | 73 | $i++; |
@@ -47,7 +47,7 @@ |
||
47 | 47 | : $this->is_checked; |
48 | 48 | |
49 | 49 | if ( $is_checked ) { |
50 | - $defaults['checked'] = 'checked'; |
|
50 | + $defaults[ 'checked' ] = 'checked'; |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $args = $this->parse_args( 'checkbox', $defaults ); |
@@ -20,7 +20,7 @@ |
||
20 | 20 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ), |
21 | 21 | ) ); |
22 | 22 | |
23 | - if ( false === strpos( $args['class'], 'timepicker' ) ) { |
|
23 | + if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) { |
|
24 | 24 | $this->parse_picker_options( 'date' ); |
25 | 25 | } |
26 | 26 |