eventespresso / event-espresso-core

core/libraries/form_sections/inputs/EE_Select_Input.input.php

Indentation +16 added lines, -16 removed lines

@@ -13,20 +13,20 @@
 class EE_Select_Input extends EE_Form_Input_With_Options_Base
 {
 
-    /**
-     * @param array $answer_options
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Select_Display_Strategy($answer_options));
-        $this->_add_validation_strategy(
-            new EE_Enum_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array $answer_options
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Select_Display_Strategy($answer_options));
+		$this->_add_validation_strategy(
+			new EE_Enum_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		parent::__construct($answer_options, $input_settings);
+	}
 }

core/libraries/form_sections/strategies/EE_Form_Input_Strategy_Base.strategy.php

Indentation +27 added lines, -27 removed lines

@@ -9,40 +9,40 @@
 abstract class EE_Form_Input_Strategy_Base
 {
 
-    /**
-     * Form Input to display
-     *
-     * @var EE_Form_Input_Base
-     */
-    protected $_input;
+	/**
+	 * Form Input to display
+	 *
+	 * @var EE_Form_Input_Base
+	 */
+	protected $_input;
 
 
 
-    public function __construct()
-    {
-    }
+	public function __construct()
+	{
+	}
 
 
 
-    /**
-     * The form input on which this strategy is to perform
-     *
-     * @param EE_Form_Input_Base $form_input
-     */
-    public function _construct_finalize(EE_Form_Input_Base $form_input)
-    {
-        $this->_input = $form_input;
-    }
+	/**
+	 * The form input on which this strategy is to perform
+	 *
+	 * @param EE_Form_Input_Base $form_input
+	 */
+	public function _construct_finalize(EE_Form_Input_Base $form_input)
+	{
+		$this->_input = $form_input;
+	}
 
 
 
-    /**
-     * Gets this strategy's input
-     *
-     * @return EE_Form_Input_Base
-     */
-    public function get_input()
-    {
-        return $this->_input;
-    }
+	/**
+	 * Gets this strategy's input
+	 *
+	 * @return EE_Form_Input_Base
+	 */
+	public function get_input()
+	{
+		return $this->_input;
+	}
 }

core/libraries/form_sections/strategies/display/EE_Submit_Input_Display_Strategy.strategy.php

Indentation +25 added lines, -25 removed lines

@@ -12,29 +12,29 @@
 class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * @return string of html to display the input
-     */
-    public function display()
-    {
-        $default_value = $this->_input->get_default();
-        if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) {
-            $default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value);
-        }
-        $html = $this->_opening_tag('input');
-        $html .= $this->_attributes_string(
-            array_merge(
-                $this->_standard_attributes_array(),
-                array(
-                    'type'  => 'submit',
-                    'value' => $default_value,
-                    // overwrite the standard id with the backwards compatible one
-                    'id' => $this->_input->html_id() . '-submit',
-                    'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
-                )
-            )
-        );
-        $html .= $this->_close_tag();
-        return $html;
-    }
+	/**
+	 * @return string of html to display the input
+	 */
+	public function display()
+	{
+		$default_value = $this->_input->get_default();
+		if ($this->_input->get_normalization_strategy() instanceof EE_Normalization_Strategy_Base) {
+			$default_value = $this->_input->get_normalization_strategy()->unnormalize($default_value);
+		}
+		$html = $this->_opening_tag('input');
+		$html .= $this->_attributes_string(
+			array_merge(
+				$this->_standard_attributes_array(),
+				array(
+					'type'  => 'submit',
+					'value' => $default_value,
+					// overwrite the standard id with the backwards compatible one
+					'id' => $this->_input->html_id() . '-submit',
+					'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
+				)
+			)
+		);
+		$html .= $this->_close_tag();
+		return $html;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
                     'type'  => 'submit',
                     'value' => $default_value,
                     // overwrite the standard id with the backwards compatible one
-                    'id' => $this->_input->html_id() . '-submit',
-                    'class' => $this->_input->html_class() . ' ' . $this->_input->button_css_attributes()
+                    'id' => $this->_input->html_id().'-submit',
+                    'class' => $this->_input->html_class().' '.$this->_input->button_css_attributes()
                 )
             )
         );

core/libraries/form_sections/strategies/display/EE_Hidden_Display_Strategy.strategy.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     *
-     * @return string of html to display the HIDDEN field
-     */
-    public function display()
-    {
-        $input = $this->_input;
-        return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}' {$input->other_html_attributes()}/>";
-    }
+	/**
+	 *
+	 * @return string of html to display the HIDDEN field
+	 */
+	public function display()
+	{
+		$input = $this->_input;
+		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}' {$input->other_html_attributes()}/>";
+	}
 }

core/libraries/form_sections/strategies/display/EE_Select_Multiple_Display_Strategy.strategy.php

Indentation +43 added lines, -43 removed lines

@@ -12,54 +12,54 @@
 class EE_Select_Multiple_Display_Strategy extends EE_Select_Display_Strategy
 {
 
-    /**
-     *
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
+	/**
+	 *
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
 
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
-            throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
-        }
+		if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+			throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
+		}
 
-        $html = EEH_HTML::nl(0, 'select');
-        $html .= '<select multiple';
-        $html .= ' id="' . $this->_input->html_id() . '"';
-        $html .= ' name="' . $this->_input->html_name() . '[]"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $html .= ' class="' . $class . '"';
-        // add html5 required
-        $html .= $this->_input->required() ? ' required' : '';
-        $html .= ' style="' . $this->_input->html_style() . '"';
-        $html .= ' ' . $this->_input->other_html_attributes();
-        $html .= '>';
+		$html = EEH_HTML::nl(0, 'select');
+		$html .= '<select multiple';
+		$html .= ' id="' . $this->_input->html_id() . '"';
+		$html .= ' name="' . $this->_input->html_name() . '[]"';
+		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
+		$html .= ' class="' . $class . '"';
+		// add html5 required
+		$html .= $this->_input->required() ? ' required' : '';
+		$html .= ' style="' . $this->_input->html_style() . '"';
+		$html .= ' ' . $this->_input->other_html_attributes();
+		$html .= '>';
 
-        EEH_HTML::indent(1, 'select');
-        if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
-            throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
-        } else {
-            $html.=$this->_display_options($this->_input->options());
-        }
+		EEH_HTML::indent(1, 'select');
+		if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
+			throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
+		} else {
+			$html.=$this->_display_options($this->_input->options());
+		}
 
-        $html.= EEH_HTML::nl(-1, 'select') . "</select>";
-        return $html;
-    }
+		$html.= EEH_HTML::nl(-1, 'select') . "</select>";
+		return $html;
+	}
 
 
 
-    /**
-     * Checks if that $value is one of the selected ones
-     * @param string|int $value unnormalized value option (string)
-     * @return boolean
-     */
-    protected function _check_if_option_selected($value)
-    {
-        $selected_options = $this->_input->raw_value();
-        if (empty($selected_options)) {
-            return false;
-        }
-        return in_array($value, $selected_options) ? true : false;
-    }
+	/**
+	 * Checks if that $value is one of the selected ones
+	 * @param string|int $value unnormalized value option (string)
+	 * @return boolean
+	 */
+	protected function _check_if_option_selected($value)
+	{
+		$selected_options = $this->_input->raw_value();
+		if (empty($selected_options)) {
+			return false;
+		}
+		return in_array($value, $selected_options) ? true : false;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -20,30 +20,30 @@
     public function display()
     {
 
-        if (! $this->_input instanceof EE_Form_Input_With_Options_Base) {
+        if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
             throw new EE_Error(sprintf(__('Cannot use Select Multiple Display Strategy with an input that doesn\'t have options', "event_espresso")));
         }
 
         $html = EEH_HTML::nl(0, 'select');
         $html .= '<select multiple';
-        $html .= ' id="' . $this->_input->html_id() . '"';
-        $html .= ' name="' . $this->_input->html_name() . '[]"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $html .= ' class="' . $class . '"';
+        $html .= ' id="'.$this->_input->html_id().'"';
+        $html .= ' name="'.$this->_input->html_name().'[]"';
+        $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+        $html .= ' class="'.$class.'"';
         // add html5 required
         $html .= $this->_input->required() ? ' required' : '';
-        $html .= ' style="' . $this->_input->html_style() . '"';
-        $html .= ' ' . $this->_input->other_html_attributes();
+        $html .= ' style="'.$this->_input->html_style().'"';
+        $html .= ' '.$this->_input->other_html_attributes();
         $html .= '>';
 
         EEH_HTML::indent(1, 'select');
         if (EEH_Array::is_multi_dimensional_array($this->_input->options())) {
             throw new EE_Error(sprintf(__("Select multiple display strategy does not allow for nested arrays of options.", "event_espresso")));
         } else {
-            $html.=$this->_display_options($this->_input->options());
+            $html .= $this->_display_options($this->_input->options());
         }
 
-        $html.= EEH_HTML::nl(-1, 'select') . "</select>";
+        $html .= EEH_HTML::nl(-1, 'select')."</select>";
         return $html;
     }
 

core/libraries/form_sections/strategies/display/EE_Text_Input_Display_Strategy.strategy.php

Indentation +45 added lines, -45 removed lines

@@ -13,58 +13,58 @@
  */
 class EE_Text_Input_Display_Strategy extends EE_Display_Strategy_Base
 {
-    /**
-     * The html "type" attribute value. default is "text"
-     * @var string
-     */
-    protected $_type;
+	/**
+	 * The html "type" attribute value. default is "text"
+	 * @var string
+	 */
+	protected $_type;
 
 
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = 'text')
-    {
-        $this->_type = $type;
-        parent::__construct();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = 'text')
+	{
+		$this->_type = $type;
+		parent::__construct();
+	}
 
 
 
-    /**
-     * Gets the html "type" attribute's value
-     * @return string
-     */
-    public function get_type()
-    {
-        if ($this->_type === 'email'
-            && ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
-        ) {
-            return 'text';
-        }
-        return $this->_type;
-    }
+	/**
+	 * Gets the html "type" attribute's value
+	 * @return string
+	 */
+	public function get_type()
+	{
+		if ($this->_type === 'email'
+			&& ! apply_filters('FHEE__EE_Text_Input_Display_Strategy__use_html5_email', false)
+		) {
+			return 'text';
+		}
+		return $this->_type;
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = '<input type="'. $this->get_type() .'"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
-        // add html5 required
-        $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
-        $input .= $this->_input->other_html_attributes();
-        $input .= '/>';
-        return $input;
-    }
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = '<input type="'. $this->get_type() .'"';
+		$input .= ' name="' . $this->_input->html_name() . '"';
+		$input .= ' id="' . $this->_input->html_id() . '"';
+		$class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
+		$input .= ' class="' . $class . '"';
+		// add html5 required
+		$input .= $this->_input->required() ? ' required' : '';
+		$input .= ' value="' . $this->_input->raw_value_in_form() . '"';
+		$input .= ' style="' . $this->_input->html_style() . '"';
+		$input .= $this->_input->other_html_attributes();
+		$input .= '/>';
+		return $input;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -54,15 +54,15 @@
      */
     public function display()
     {
-        $input = '<input type="'. $this->get_type() .'"';
-        $input .= ' name="' . $this->_input->html_name() . '"';
-        $input .= ' id="' . $this->_input->html_id() . '"';
-        $class = $this->_input->required() ? $this->_input->required_css_class() . ' ' . $this->_input->html_class() : $this->_input->html_class();
-        $input .= ' class="' . $class . '"';
+        $input = '<input type="'.$this->get_type().'"';
+        $input .= ' name="'.$this->_input->html_name().'"';
+        $input .= ' id="'.$this->_input->html_id().'"';
+        $class = $this->_input->required() ? $this->_input->required_css_class().' '.$this->_input->html_class() : $this->_input->html_class();
+        $input .= ' class="'.$class.'"';
         // add html5 required
         $input .= $this->_input->required() ? ' required' : '';
-        $input .= ' value="' . $this->_input->raw_value_in_form() . '"';
-        $input .= ' style="' . $this->_input->html_style() . '"';
+        $input .= ' value="'.$this->_input->raw_value_in_form().'"';
+        $input .= ' style="'.$this->_input->html_style().'"';
         $input .= $this->_input->other_html_attributes();
         $input .= '/>';
         return $input;

core/libraries/form_sections/strategies/display/EE_Checkbox_Dropdown_Selector_Display_Strategy.strategy.php

Indentation +141 added lines, -141 removed lines

@@ -12,158 +12,158 @@
 {
 
 
-    /**
-     * enqueues css and js, so that this can be called statically
-     */
-    public static function enqueue_styles_and_scripts()
-    {
-        wp_register_style(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
-            array('espresso_default'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_register_style(
-            'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-            array('dashicons'),
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('checkbox_dropdown_selector');
-        wp_register_script(
-            'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
-            array('jquery'),
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_enqueue_script('checkbox_dropdown_selector');
-    }
+	/**
+	 * enqueues css and js, so that this can be called statically
+	 */
+	public static function enqueue_styles_and_scripts()
+	{
+		wp_register_style(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+			array('espresso_default'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_register_style(
+			'espresso_default',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+			array('dashicons'),
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('checkbox_dropdown_selector');
+		wp_register_script(
+			'checkbox_dropdown_selector',
+			EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+			array('jquery'),
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_enqueue_script('checkbox_dropdown_selector');
+	}
 
 
 
-    /**
-     * Informs the rest of the forms system what CSS and JS is needed to display the input
-     */
-    public function enqueue_js()
-    {
-        EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
-    }
+	/**
+	 * Informs the rest of the forms system what CSS and JS is needed to display the input
+	 */
+	public function enqueue_js()
+	{
+		EE_Checkbox_Dropdown_Selector_Display_Strategy::enqueue_styles_and_scripts();
+	}
 
 
 
-    /**
-     * callback for Iframe::addStylesheets() child class methods
-     *
-     * @param array $iframe_css
-     * @return array
-     */
-    public function iframe_css(array $iframe_css)
-    {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
-        return $iframe_css;
-    }
+	/**
+	 * callback for Iframe::addStylesheets() child class methods
+	 *
+	 * @param array $iframe_css
+	 * @return array
+	 */
+	public function iframe_css(array $iframe_css)
+	{
+		$iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+		return $iframe_css;
+	}
 
 
 
-    /**
-     * callback for Iframe::addScripts() child class methods
-     *
-     * @param array $iframe_js
-     * @return array
-     */
-    public function iframe_js(array $iframe_js)
-    {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
-        return $iframe_js;
-    }
+	/**
+	 * callback for Iframe::addScripts() child class methods
+	 *
+	 * @param array $iframe_js
+	 * @return array
+	 */
+	public function iframe_js(array $iframe_js)
+	{
+		$iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+		return $iframe_js;
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @return string of html to display the field
-     */
-    public function display()
-    {
-        $input = $this->get_input();
-        $select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
-        // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
-        $input->set_label_sizes();
-        $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
-            EE_Error::doing_it_wrong(
-                'EE_Checkbox_Display_Strategy::display()',
-                sprintf(
-                    esc_html__(
-                        'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
-                        'event_espresso'
-                    ),
-                    $input->html_id(),
-                    var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
-                ),
-                '4.8.1'
-            );
-        }
+	/**
+	 * @throws EE_Error
+	 * @return string of html to display the field
+	 */
+	public function display()
+	{
+		$input = $this->get_input();
+		$select_button_text = $input instanceof EE_Checkbox_Dropdown_Selector_Input ? $input->select_button_text() : '';
+		// $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$input->set_label_sizes();
+		$label_size_class = $input->get_label_size_class();
+		if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+			EE_Error::doing_it_wrong(
+				'EE_Checkbox_Display_Strategy::display()',
+				sprintf(
+					esc_html__(
+						'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"',
+						'event_espresso'
+					),
+					$input->html_id(),
+					var_export($input->raw_value(), true),
+					$input->html_name() . '[]'
+				),
+				'4.8.1'
+			);
+		}
 
 
-        $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
-        // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->html_other_attributes() . '>';
-        $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
-        $html .= $select_button_text;
-        $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
-        $html .= '</button>';
-        $html .= EEH_HTML::div(
-            '',
-            $input->html_id() . '-options-dv',
-            'checkbox-dropdown-selector'
-        );
-        $html .= EEH_HTML::link(
-            '',
-            '<span class="dashicons dashicons-no"></span>',
-            esc_html__('close datetime selector', 'event_espresso'),
-            '',
-            'close-espresso-notice'
-        );
-        $html .= EEH_HTML::ul();
-        $input_raw_value = (array) $input->raw_value();
-        foreach ($input->options() as $value => $display_text) {
-            $html .= EEH_HTML::li();
-            $value = $input->get_normalization_strategy()->unnormalize_one($value);
-            $html_id = $this->get_sub_input_id($value);
-            $html .= EEH_HTML::nl(0, 'checkbox');
-            $html .= '<label for="'
-                     . $html_id
-                     . '" id="'
-                     . $html_id
-                     . '-lbl" class="ee-checkbox-label-after'
-                     . $label_size_class
-                     . '">';
-            $html .= EEH_HTML::nl(1, 'checkbox');
-            $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
-            $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
-                ? ' checked="checked"'
-                : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
-            $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
-            $html .= EEH_HTML::lix();
-        }
-        $html .= EEH_HTML::ulx();
-        $html .= EEH_HTML::divx();
-        $html .= EEH_HTML::divx();
-        $html .= \EEH_HTML::br();
-        return $html;
-    }
+		$html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
+		$html .= '<button id="' . $input->html_id() . '-btn"';
+		// $html .= ' name="' . $input->html_name() . '"';
+		$html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
+		$html .= ' style="' . $input->html_style() . '"';
+		$html .= ' data-target="' . $input->html_id() . '-options-dv"';
+		$html .= ' ' . $input->html_other_attributes() . '>';
+		$html .= '<span class="checkbox-dropdown-selector-selected-spn">';
+		$html .= $select_button_text;
+		$html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
+		$html .= '</button>';
+		$html .= EEH_HTML::div(
+			'',
+			$input->html_id() . '-options-dv',
+			'checkbox-dropdown-selector'
+		);
+		$html .= EEH_HTML::link(
+			'',
+			'<span class="dashicons dashicons-no"></span>',
+			esc_html__('close datetime selector', 'event_espresso'),
+			'',
+			'close-espresso-notice'
+		);
+		$html .= EEH_HTML::ul();
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$html .= EEH_HTML::li();
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $this->get_sub_input_id($value);
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'
+					 . $html_id
+					 . '" id="'
+					 . $html_id
+					 . '-lbl" class="ee-checkbox-label-after'
+					 . $label_size_class
+					 . '">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
+			$html .= '<input type="checkbox"';
+			$html .= ' name="' . $input->html_name() . '[]"';
+			$html .= ' id="' . $html_id . '"';
+			$html .= ' class="' . $input->html_class() . '-option"';
+			$html .= ' style="' . $input->html_style() . '"';
+			$html .= ' value="' . esc_attr($value) . '"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
+				? ' checked="checked"'
+				: '';
+			$html .= ' ' . $this->_input->other_html_attributes();
+			$html .= '>';
+			$html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
+			$html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+			$html .= EEH_HTML::lix();
+		}
+		$html .= EEH_HTML::ulx();
+		$html .= EEH_HTML::divx();
+		$html .= EEH_HTML::divx();
+		$html .= \EEH_HTML::br();
+		return $html;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -19,20 +19,20 @@ 
     {
         wp_register_style(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css',
+            EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css',
             array('espresso_default'),
             EVENT_ESPRESSO_VERSION
         );
         wp_register_style(
             'espresso_default',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
             array('dashicons'),
             EVENT_ESPRESSO_VERSION
         );
         wp_enqueue_style('checkbox_dropdown_selector');
         wp_register_script(
             'checkbox_dropdown_selector',
-            EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js',
             array('jquery'),
             EVENT_ESPRESSO_VERSION,
             true
@@ -60,7 +60,7 @@ 
      */
     public function iframe_css(array $iframe_css)
     {
-        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'css/checkbox_dropdown_selector.css';
+        $iframe_css['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'css/checkbox_dropdown_selector.css';
         return $iframe_css;
     }
 
@@ -74,7 +74,7 @@ 
      */
     public function iframe_js(array $iframe_js)
     {
-        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL . 'scripts/checkbox_dropdown_selector.js';
+        $iframe_js['checkbox_dropdown_selector'] = EE_GLOBAL_ASSETS_URL.'scripts/checkbox_dropdown_selector.js';
         return $iframe_js;
     }
 
@@ -90,7 +90,7 @@ 
         // $multi = count( $input->options() ) > 1 ? TRUE : FALSE;
         $input->set_label_sizes();
         $label_size_class = $input->get_label_size_class();
-        if (! is_array($input->raw_value()) && $input->raw_value() !== null) {
+        if ( ! is_array($input->raw_value()) && $input->raw_value() !== null) {
             EE_Error::doing_it_wrong(
                 'EE_Checkbox_Display_Strategy::display()',
                 sprintf(
@@ -100,7 +100,7 @@ 
                     ),
                     $input->html_id(),
                     var_export($input->raw_value(), true),
-                    $input->html_name() . '[]'
+                    $input->html_name().'[]'
                 ),
                 '4.8.1'
             );
@@ -108,19 +108,19 @@ 
 
 
         $html = \EEH_HTML::div('', '', 'checkbox-dropdown-selector-wrap-dv');
-        $html .= '<button id="' . $input->html_id() . '-btn"';
+        $html .= '<button id="'.$input->html_id().'-btn"';
         // $html .= ' name="' . $input->html_name() . '"';
-        $html .= ' class="' . $input->html_class() . ' checkbox-dropdown-selector-btn button-secondary button"';
-        $html .= ' style="' . $input->html_style() . '"';
-        $html .= ' data-target="' . $input->html_id() . '-options-dv"';
-        $html .= ' ' . $input->html_other_attributes() . '>';
+        $html .= ' class="'.$input->html_class().' checkbox-dropdown-selector-btn button-secondary button"';
+        $html .= ' style="'.$input->html_style().'"';
+        $html .= ' data-target="'.$input->html_id().'-options-dv"';
+        $html .= ' '.$input->html_other_attributes().'>';
         $html .= '<span class="checkbox-dropdown-selector-selected-spn">';
         $html .= $select_button_text;
         $html .= '</span> <span class="dashicons dashicons-arrow-down"></span>';
         $html .= '</button>';
         $html .= EEH_HTML::div(
             '',
-            $input->html_id() . '-options-dv',
+            $input->html_id().'-options-dv',
             'checkbox-dropdown-selector'
         );
         $html .= EEH_HTML::link(
@@ -146,18 +146,18 @@ 
                      . '">';
             $html .= EEH_HTML::nl(1, 'checkbox');
             $html .= '<input type="checkbox"';
-            $html .= ' name="' . $input->html_name() . '[]"';
-            $html .= ' id="' . $html_id . '"';
-            $html .= ' class="' . $input->html_class() . '-option"';
-            $html .= ' style="' . $input->html_style() . '"';
-            $html .= ' value="' . esc_attr($value) . '"';
+            $html .= ' name="'.$input->html_name().'[]"';
+            $html .= ' id="'.$html_id.'"';
+            $html .= ' class="'.$input->html_class().'-option"';
+            $html .= ' style="'.$input->html_style().'"';
+            $html .= ' value="'.esc_attr($value).'"';
             $html .= ! empty($input_raw_value) && in_array($value, $input_raw_value, true)
                 ? ' checked="checked"'
                 : '';
-            $html .= ' ' . $this->_input->other_html_attributes();
+            $html .= ' '.$this->_input->other_html_attributes();
             $html .= '>';
-            $html .= '<span class="datetime-selector-option-text-spn">' . $display_text . '</span>';
-            $html .= EEH_HTML::nl(-1, 'checkbox') . '</label>';
+            $html .= '<span class="datetime-selector-option-text-spn">'.$display_text.'</span>';
+            $html .= EEH_HTML::nl(-1, 'checkbox').'</label>';
             $html .= EEH_HTML::lix();
         }
         $html .= EEH_HTML::ulx();

core/libraries/form_sections/strategies/display/EE_Admin_File_Uploader_Display_Strategy.strategy.php

Indentation +61 added lines, -61 removed lines

@@ -11,73 +11,73 @@
 class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base
 {
 
-    /**
-     * Its important this media only get enqueued AFTER init, but before the footer... where the
-     * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
-     * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
-     * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
-     * to select media).
-     * Besides that, no special consideration should be required to make the media uploader appear, besides having
-     * this input displayed.
-     * @deprecated. enqueue_js should be called automatically now
-     */
-    public static function enqueue_scripts()
-    {
-        EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form', 'event_espresso'), '4.9.8.rc.015');
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-    }
+	/**
+	 * Its important this media only get enqueued AFTER init, but before the footer... where the
+	 * rest of our forms JS gets enqueued. Otherwise the JS gets enqueued fine, and loaded on the page fine,
+	 * but when you upload an image it gets uploaded fine to the server, but it doesn't display and reports an error
+	 * (also it doesn't show any of the currently existing media in the modal window that pops up when you click the button
+	 * to select media).
+	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
+	 * this input displayed.
+	 * @deprecated. enqueue_js should be called automatically now
+	 */
+	public static function enqueue_scripts()
+	{
+		EE_Error::doing_it_wrong(__FUNCTION__, __('EE_Admin_File_Uploader_Display_Strategy::enqueue_scripts() no longer needs to be called in order to display the admin uploader input correctly. This is handled now by EE_Admin_File_Uploader_Display_Strategy::enqueue_js() which is called automatically when enqueueing JS and CSS for the form', 'event_espresso'), '4.9.8.rc.015');
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+	}
     
-    /**
-     * Enqueues the JS and CSS needed to display this input
-     */
-    public function enqueue_js()
-    {
-        wp_enqueue_media();
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
-        parent::enqueue_js();
-    }
+	/**
+	 * Enqueues the JS and CSS needed to display this input
+	 */
+	public function enqueue_js()
+	{
+		wp_enqueue_media();
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
+		parent::enqueue_js();
+	}
 
 
 
-    /**
-     *
-     * @return string of html to display the field
-     */
+	/**
+	 *
+	 * @return string of html to display the field
+	 */
 
-    public function display()
-    {
-        // the actual input
-        $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
-        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
-        // image uploader
-        $uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
-        // only attempt to show the image if it at least exists
-        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
-        // html string
-        return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
-    }
+	public function display()
+	{
+		// the actual input
+		$input = '<input type="text" size="34" ';
+		$input .= 'name="' . $this->_input->html_name() . '" ';
+		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
+		$input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
+		$input .= $this->_input->other_html_attributes() . '>';
+		// image uploader
+		$uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
+		// only attempt to show the image if it at least exists
+		$image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
+		// html string
+		return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
+	}
 
 
 
-    /**
-     * Asserts an image actually exists as quickly as possible by sending a HEAD
-     * request
-     * @param string $src
-     * @return boolean
-     */
-    protected function src_exists($src)
-    {
-        $results = wp_remote_head($src);
-        if (is_array($results) && ! $results instanceof WP_Error) {
-            return strpos($results['headers']['content-type'], "image") !== false;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Asserts an image actually exists as quickly as possible by sending a HEAD
+	 * request
+	 * @param string $src
+	 * @return boolean
+	 */
+	protected function src_exists($src)
+	{
+		$results = wp_remote_head($src);
+		if (is_array($results) && ! $results instanceof WP_Error) {
+			return strpos($results['headers']['content-type'], "image") !== false;
+		} else {
+			return false;
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -51,16 +51,16 @@
     {
         // the actual input
         $input = '<input type="text" size="34" ';
-        $input .= 'name="' . $this->_input->html_name() . '" ';
-        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
-        $input .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-        $input .= $this->_input->other_html_attributes() . '>';
+        $input .= 'name="'.$this->_input->html_name().'" ';
+        $input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url '.$this->_input->html_class().'" ' : 'class="large-text ee_media_url" ';
+        $input .= 'value="'.$this->_input->raw_value_in_form().'" ';
+        $input .= $this->_input->other_html_attributes().'>';
         // image uploader
-        $uploader = EEH_HTML::link('#', '<img src="' . admin_url('images/media-button-image.gif') . '" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
+        $uploader = EEH_HTML::link('#', '<img src="'.admin_url('images/media-button-image.gif').'" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
         // only attempt to show the image if it at least exists
-        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2) . EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
+        $image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2).EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
         // html string
-        return EEH_HTML::div($input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area');
+        return EEH_HTML::div($input.EEH_HTML::nbsp().$uploader.$image, '', 'ee_media_uploader_area');
     }
 
 

core/libraries/form_sections/strategies/display/EE_Select2_Display_Strategy.strategy.php

Indentation +60 added lines, -60 removed lines

@@ -15,69 +15,69 @@
 class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy
 {
 
-    /**
-     * Arguments that will be passed into the select2 javascript constructor
-     * @var array
-     */
-    protected $_select2_js_args = array();
+	/**
+	 * Arguments that will be passed into the select2 javascript constructor
+	 * @var array
+	 */
+	protected $_select2_js_args = array();
 
-    /**
-     *
-     * @param array $select2_js_args pass in the EXACT array of JS arguments you want
-     * to pass into the select2 js/html input. See https://select2.github.io
-     */
-    public function __construct($select2_js_args = array())
-    {
-        $this->_select2_js_args = $select2_js_args;
-        parent::__construct();
-    }
+	/**
+	 *
+	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
+	 * to pass into the select2 js/html input. See https://select2.github.io
+	 */
+	public function __construct($select2_js_args = array())
+	{
+		$this->_select2_js_args = $select2_js_args;
+		parent::__construct();
+	}
 
-    /**
-     * enqueues the select2 initializing js (which depends on the select2 js) and
-     * the select2 css
-     */
-    public function enqueue_js()
-    {
-        // need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
-        // is carelessly registering an older version of Select2 on admin pages that don't even belong to them
-        wp_deregister_script('select2');
-        wp_deregister_style('select2');
-        wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
-        wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
-        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-    }
+	/**
+	 * enqueues the select2 initializing js (which depends on the select2 js) and
+	 * the select2 css
+	 */
+	public function enqueue_js()
+	{
+		// need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
+		// is carelessly registering an older version of Select2 on admin pages that don't even belong to them
+		wp_deregister_script('select2');
+		wp_deregister_style('select2');
+		wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
+		wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+	}
 
-    /**
-     * Gets the javascript args which will be localized and passed into the select2 js/html input
-     * @return array
-     */
-    public function get_js_args()
-    {
-        return $this->_select2_js_args;
-    }
+	/**
+	 * Gets the javascript args which will be localized and passed into the select2 js/html input
+	 * @return array
+	 */
+	public function get_js_args()
+	{
+		return $this->_select2_js_args;
+	}
 
-    /**
-     * Sets the exact js args which will be passed into the select2 js/html input
-     * @param array $js_args
-     */
-    public function set_js_args($js_args)
-    {
-        $this->_select2_js_args = $js_args;
-    }
+	/**
+	 * Sets the exact js args which will be passed into the select2 js/html input
+	 * @param array $js_args
+	 */
+	public function set_js_args($js_args)
+	{
+		$this->_select2_js_args = $js_args;
+	}
 
-    /**
-     * Adds select2 data for localization
-     * @param array $other_js_data
-     * @return array
-     */
-    public function get_other_js_data($other_js_data = array())
-    {
-        $other_js_data = parent::get_other_js_data($other_js_data);
-        if (! isset($other_js_data['select2s'])) {
-            $other_js_data['select2s'] = array();
-        }
-        $other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
-        return $other_js_data;
-    }
+	/**
+	 * Adds select2 data for localization
+	 * @param array $other_js_data
+	 * @return array
+	 */
+	public function get_other_js_data($other_js_data = array())
+	{
+		$other_js_data = parent::get_other_js_data($other_js_data);
+		if (! isset($other_js_data['select2s'])) {
+			$other_js_data['select2s'] = array();
+		}
+		$other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
+		return $other_js_data;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -42,10 +42,10 @@ 
         // is carelessly registering an older version of Select2 on admin pages that don't even belong to them
         wp_deregister_script('select2');
         wp_deregister_style('select2');
-        wp_register_script('select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true);
-        wp_register_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
-        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true);
-        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all');
+        wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
+        wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
+        wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
+        wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
     }
 
     /**
@@ -74,10 +74,10 @@ 
     public function get_other_js_data($other_js_data = array())
     {
         $other_js_data = parent::get_other_js_data($other_js_data);
-        if (! isset($other_js_data['select2s'])) {
+        if ( ! isset($other_js_data['select2s'])) {
             $other_js_data['select2s'] = array();
         }
-        $other_js_data['select2s'][ $this->_input->html_id() ] = $this->get_js_args();
+        $other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
         return $other_js_data;
     }
 }