Skip to content

Commit 8a648bc

Browse files
committed
#1392, #1387 - thanks @rrikesh
Signed-off-by:KProvance <[email protected]>
1 parent 7b8463c commit 8a648bc

File tree

7 files changed

+53
-12
lines changed

7 files changed

+53
-12
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,14 @@ Send me an email at [email protected] so I can add you to our user sp
7878

7979
### Master ###
8080

81+
= 3.3.2.4 =
82+
* Fixed: #1387 - Page jump when clicking "Options Object". Thanks @rrikesh.
83+
* Added: #1392 - Filters to change the following localized strings:
84+
redux/{opt_name}/localize/reset
85+
redux/{opt_name}/localize/reset_all
86+
redux/{opt_name}/localize/save_pending
87+
redux/{opt_name}/localize/preset
88+
8189
= 3.3.2.3 =
8290
* Fixed: #1376 - checkbox.min.js missing.
8391

ReduxCore/assets/js/redux.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,8 @@
514514

515515
$.redux.devFunctions = function() {
516516
$('#consolePrintObject').on(
517-
'click', function() {
517+
'click', function(e) {
518+
e.preventDefault();
518519
console.log($.parseJSON($("#redux-object-json").html()));
519520
}
520521
);

ReduxCore/assets/js/redux.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ReduxCore/framework.php

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class ReduxFramework {
6363
// ATTENTION DEVS
6464
// Please update the build number with each push, no matter how small.
6565
// This will make for easier support when we ask users what version they are using.
66-
public static $_version = '3.3.2.3';
66+
public static $_version = '3.3.2.4';
6767
public static $_dir;
6868
public static $_url;
6969
public static $_upload_dir;
@@ -107,7 +107,7 @@ static function init() {
107107
}
108108

109109
// ::init()
110-
110+
111111
public $framework_url = 'http://www.reduxframework.com/';
112112
public static $instance = null;
113113
public $admin_notices = array();
@@ -1885,14 +1885,48 @@ public function _enqueue() {
18851885
}
18861886
}
18871887
}
1888+
18881889
$this->localize_data['fieldsHidden'] = $this->fieldsHidden;
18891890
$this->localize_data['options'] = $this->options;
18901891
$this->localize_data['defaults'] = $this->options_defaults;
1892+
1893+
/**
1894+
* Save pending string
1895+
* filter 'redux/{opt_name}/localize/save_pending
1896+
*
1897+
* @param string save_pending string
1898+
*/
1899+
$save_pending = apply_filters("redux/{$this->args['opt_name']}/localize/save_pending", __( 'You have changes that are not saved. Would you like to save them now?', 'redux-framework' ));
1900+
1901+
/**
1902+
* Reset all string
1903+
* filter 'redux/{opt_name}/localize/reset
1904+
*
1905+
* @param string reset all string
1906+
*/
1907+
$reset_all = apply_filters("redux/{$this->args['opt_name']}/localize/reset", __( 'Are you sure? Resetting will lose all custom values.', 'redux-framework' ));
1908+
1909+
/**
1910+
* Reset section string
1911+
* filter 'redux/{opt_name}/localize/reset_section
1912+
*
1913+
* @param string reset section string
1914+
*/
1915+
$reset_section = apply_filters("redux/{$this->args['opt_name']}/localize/reset_section", __( 'Are you sure? Resetting will lose all custom values in this section.', 'redux-framework' ));
1916+
1917+
/**
1918+
* Preset confirm string
1919+
* filter 'redux/{opt_name}/localize/preset
1920+
*
1921+
* @param string preset confirm string
1922+
*/
1923+
$preset_confirm = apply_filters("redux/{$this->args['opt_name']}/localize/preset", __( 'Your current options will be replaced with the values of this preset. Would you like to proceed?', 'redux-framework' ));
1924+
18911925
$this->localize_data['args'] = array(
1892-
'save_pending' => __( 'You have changes that are not saved. Would you like to save them now?', 'redux-framework' ),
1893-
'reset_confirm' => __( 'Are you sure? Resetting will lose all custom values.', 'redux-framework' ),
1894-
'reset_section_confirm' => __( 'Are you sure? Resetting will lose all custom values in this section.', 'redux-framework' ),
1895-
'preset_confirm' => __( 'Your current options will be replaced with the values of this preset. Would you like to proceed?', 'redux-framework' ),
1926+
'save_pending' => $save_pending,
1927+
'reset_confirm' => $reset_all,
1928+
'reset_section_confirm' => $reset_section,
1929+
'preset_confirm' => $preset_confirm,
18961930
'please_wait' => __( 'Please Wait', 'redux-framework' ),
18971931
'opt_name' => $this->args['opt_name'],
18981932
'slug' => $this->args['page_slug'],
@@ -1901,7 +1935,6 @@ public function _enqueue() {
19011935
'class' => $this->args['class'],
19021936
);
19031937

1904-
19051938
// Construct the errors array.
19061939
if ( isset( $this->transients['last_save_mode'] ) && ! empty( $this->transients['notices']['errors'] ) ) {
19071940
$theTotal = 0;

ReduxCore/inc/fields/background/field_background.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ public function render() {
107107
echo '<input type="hidden" class="select2_params" value="' . $select2_params . '">';
108108
}
109109

110-
111110
if ( $this->field['background-color'] === true ) {
112111

113112
if ( isset( $this->value['color'] ) && empty( $this->value['background-color'] ) ) {

class.redux-plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ReduxFrameworkPlugin {
2525
* @const string VERSION The plugin version, used for cache-busting and script file references
2626
* @since 3.0.0
2727
*/
28-
const VERSION = '3.3.2.3';
28+
const VERSION = '3.3.2.4';
2929

3030
/**
3131
* @access protected

redux-framework.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Description: Redux is a simple, truly extensible options framework for WordPress themes and plugins.
1313
* Author: Team Redux
1414
* Author URI: http://reduxframework.com
15-
* Version: 3.3.2.3
15+
* Version: 3.3.2.4
1616
* Text Domain: redux-framework
1717
* License: GPL3+
1818
* License URI: http://www.gnu.org/licenses/gpl-3.0.txt

0 commit comments

Comments
 (0)