Skip to content

Commit 1c3cecc

Browse files
committed
Various fixes.
1 parent b934d92 commit 1c3cecc

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

ReduxCore/framework.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,7 @@ public function _enqueue() {
922922

923923
wp_enqueue_script('jquery');
924924
wp_enqueue_script('jquery-ui-core');
925+
wp_enqueue_script('jquery-ui-sortable');
925926
add_thickbox();
926927

927928
wp_register_style(

ReduxCore/inc/fields/border/field_border.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ function render(){
135135
**/
136136

137137
if ( $this->field['color'] != false ):
138-
echo '<input name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][border-color]" id="' . $this->field['id'] . '-border" class="redux-border-color redux-color redux-color-init ' . $this->field['class'] . '" type="text" value="' . $value['color'] . '" data-default-color="' . $this->field['border-color'] . '" data-id="'.$this->field['id'].'" />';
138+
$default = isset( $this->field['border-color'] ) ? $this->field['border-color'] : "";
139+
$default = ( empty( $default ) && isset( $this->field['color'] ) ) ? $this->field['color'] : "";
140+
echo '<input name="' . $this->args['opt_name'] . '[' . $this->field['id'] . '][border-color]" id="' . $this->field['id'] . '-border" class="redux-border-color redux-color redux-color-init ' . $this->field['class'] . '" type="text" value="' . $value['color'] . '" data-default-color="' . $default . '" data-id="'.$this->field['id'].'" />';
139141
endif;
140142

141143

ReduxCore/inc/fields/sorter/field_sorter.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ function render() {
119119
}
120120

121121
function enqueue() {
122-
wp_enqueue_script('jquery-ui-sortable');
123122
wp_register_script('options-sorter', ReduxFramework::$_url . 'inc/fields/sorter/field_sorter.min.js', array(
124123
'jquery'));
125124
wp_register_style('options-sorter', ReduxFramework::$_url . 'inc/fields/sorter/field_sorter.css');

0 commit comments

Comments
 (0)