Skip to content

Commit 8534fa3

Browse files
author
Ghost1227
committed
Bring embedded sources up to date
1 parent da74bc3 commit 8534fa3

37 files changed

+1477
-83
lines changed

‎assets/css/style.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#redux-main .description{margin-top:7px}
33
a{outline:0 !important}
44
.ui-datepicker table{background:#fff}
5+
.ui-state-highlight{height:2.5em;line-height:2.2em}
56
#redux-container{font-family:"Lucida Grande",Sans-serif;background-color:#eee;background-repeat:repeat-x;background-image:-moz-linear-gradient(top, #f5f5f5 0, #eee 100%);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0, #f5f5f5), color-stop(100%, #eee));background-image:-webkit-linear-gradient(top, #f5f5f5 0, #eee 100%);background-image:-ms-linear-gradient(top, #f5f5f5 0, #eee 100%);background-image:-o-linear-gradient(top, #f5f5f5 0, #eee 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);background-image:linear-gradient(top, #f5f5f5 0, #eee 100%);border:1px solid #e5e5e5;-moz-border-radius:10px;-webkit-border-radius:10px;border-radius:10px;-moz-box-shadow:0 1px 0 #fff inset,0 1px 5px rgba(0,0,0,0.1);-webkit-box-shadow:0 1px 0 #fff inset,0 1px 5px rgba(0,0,0,0.1);box-shadow:0 1px 0 #fff inset,0 1px 5px rgba(0,0,0,0.1);margin-top:20px;overflow:hidden}
67
#redux-container .hr{height:20px;line-height:20px;float:none;border-color:#e7e7e7;display:block;width:100%;height:35px !important;line-height:35px !important;position:relative;margin:15px 0 10px 0;float:left}
78
#redux-container .inner{width:42% !important;left:40% !important;margin-left:-6%;background-color:#fcfcfc;border-color:#e7e7e7;position:absolute;height:1px;top:50%;width:100%;margin-top:-1px;border-top-width:1px;border-top-style:solid}
@@ -97,6 +98,7 @@ a{outline:0 !important}
9798
#redux-main select,#redux-main .select_wrapper{width:340px}
9899
#redux-main textarea{width:100%}
99100
#redux-main input[type=text]{width:340px}
101+
#redux-main input.full-text{width:100%}
100102
#redux-main input.checkbox,#redux-main input.radio{margin-right:10px}
101103
label.radio,label.multicheck{position:relative}
102104
#redux-main .input-text-small{width:60px;margin-right:10px}

‎assets/css/style.less‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ a {
1313

1414
.ui-datepicker table { background: #fff; }
1515

16+
.ui-state-highlight { height: 2.5em; line-height: 2.2em; }
17+
1618
#redux-container{
1719
font-family: "Lucida Grande", Sans-serif;
1820
background-color: #eeeeee; /* Old browsers */
@@ -661,9 +663,11 @@ border: 1px solid #e5e5e5;
661663
#redux-main input[type=text] {
662664
width: 340px;
663665
}
666+
#redux-main input.full-text {
667+
width: 100%;
668+
}
664669
#redux-main input.checkbox, #redux-main input.radio {
665670
margin-right: 10px;
666-
667671
}
668672
label.radio, label.multicheck {
669673
position: relative;

‎assets/js/admin.js‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,23 @@
88

99
$(document).ready(function(){
1010

11+
jQuery.fn.isOnScreen = function() {
12+
if (!window) {
13+
return;
14+
}
15+
var win = jQuery(window);
16+
var viewport = {
17+
top: win.scrollTop(),
18+
left: win.scrollLeft()
19+
};
20+
viewport.right = viewport.left + win.width();
21+
viewport.bottom = viewport.top + win.height();
22+
var bounds = this.offset();
23+
bounds.right = bounds.left + this.outerWidth();
24+
bounds.bottom = bounds.top + this.outerHeight();
25+
return (!(viewport.right < bounds.left || viewport.left > bounds.right || viewport.bottom < bounds.top || viewport.top > bounds.bottom));
26+
};
27+
1128
$.redux.required();
1229

1330
the_body.on('check_dependencies', function(event,variable){
@@ -494,23 +511,7 @@ jQuery(document).ready(function($) {
494511
}
495512
jQuery('#redux-export-link-value').toggle('fade');
496513
});
497-
jQuery.fn.isOnScreen = function() {
498-
if (!window) {
499-
return;
500-
}
501514

502-
var win = jQuery(window);
503-
var viewport = {
504-
top: win.scrollTop(),
505-
left: win.scrollLeft()
506-
};
507-
viewport.right = viewport.left + win.width();
508-
viewport.bottom = viewport.top + win.height();
509-
var bounds = this.offset();
510-
bounds.right = bounds.left + this.outerWidth();
511-
bounds.bottom = bounds.top + this.outerHeight();
512-
return (!(viewport.right < bounds.left || viewport.left > bounds.right || viewport.bottom < bounds.top || viewport.top > bounds.bottom));
513-
};
514515
/**
515516
Show the sticky header bar and notes!
516517
**/

‎assets/js/admin.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.

‎extensions/customizer/extension_customizer.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ReduxFramework_extension_customizer extends ReduxFramework {
5050
*/
5151
public function __construct( $parent ) {
5252
global $pagenow;
53-
if ($pagenow !== "customize.php") {
53+
if ($pagenow !== "customize.php" && $pagenow !== "admin-ajax.php") {
5454
return;
5555
}
5656

@@ -68,7 +68,7 @@ public function __construct( $parent ) {
6868
6969
*/
7070

71-
add_action( 'admin_init', array( &$this, '_enqueue' ), 30 );
71+
add_action( 'admin_init', array( &$this, '_enqueue' ), 30 ); // Customizer control scripts
7272

7373
add_action( 'customize_register', array( &$this, '_register_customizer_controls' ) ); // Create controls
7474

‎framework.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @package ReduxFramework
1818
* @author Daniel J Griffiths (Ghost1227)
1919
* @author Dovy Paukstys (dovy)
20-
* @version 3.0.1
20+
* @version 3.0.3
2121
*/
2222

2323
// Exit if accessed directly
@@ -26,7 +26,7 @@
2626
// Don't duplicate me!
2727
if( !class_exists( 'ReduxFramework' ) ) {
2828

29-
define('REDUX_VERSION', '3.0.1');
29+
define('REDUX_VERSION', '3.0.3');
3030

3131
// Windows-proof constants: replace backward by forward slashes
3232
// Thanks to: https://github.com/peterbouwmeester
@@ -166,7 +166,7 @@ public function __construct( $sections = array(), $args = array(), $extra_tabs =
166166
add_action( 'init', array( &$this, '_register_extensions' ), 2 );
167167

168168
// Any dynamic CSS output, let's run
169-
add_action( 'wp_enqueue_scripts', array( &$this, '_enqueue_output' ), 100 );
169+
add_action( 'wp_head', array( &$this, '_enqueue_output' ), 100 );
170170

171171
// Hook into the WP feeds for downloading exported settings
172172
add_action( 'do_feed_reduxopts-' . $this->args['opt_name'], array( &$this, '_download_options' ), 1, 1 );
@@ -1055,7 +1055,7 @@ public function _register_setting() {
10551055
foreach( $section['fields'] as $fieldk => $field ) {
10561056

10571057
$th = "";
1058-
if( isset( $field['title'] ) && isset( $field['type'] ) && $field['type'] !== "info" ) {
1058+
if( isset( $field['title'] ) && isset( $field['type'] ) && $field['type'] !== "info" && $field['type'] !== "group" ) {
10591059
$default_mark = ( !empty($field['default']) && isset($this->options[$field['id']]) && $this->options[$field['id']] == $field['default'] && !empty( $this->args['default_mark'] ) && isset( $field['default'] ) ) ? $this->args['default_mark'] : '';
10601060
if (!empty($field['title'])) {
10611061
$th = $field['title'] . $default_mark;
@@ -1078,7 +1078,7 @@ public function _register_setting() {
10781078
$runUpdate = true;
10791079
}
10801080

1081-
if ( $this->args['default_show'] === true && isset( $field['default'] ) && isset($this->options[$field['id']]) && $this->options[$field['id']] != $field['default'] && $field['type'] !== "info" ) {
1081+
if ( $this->args['default_show'] === true && isset( $field['default'] ) && isset($this->options[$field['id']]) && $this->options[$field['id']] != $field['default'] && $field['type'] !== "info" && $field['type'] !== "group" ) {
10821082
$default_output = "";
10831083
if (!is_array($field['default'])) {
10841084
if ( !empty( $field['options'][$field['default']] ) ) {
@@ -1792,7 +1792,7 @@ public function _field_input( $field, $v = "" ) {
17921792
$field['description'] = $field['desc'];
17931793
}
17941794

1795-
echo ( isset( $field['description'] ) && $field['type'] != "info" && !empty( $field['description'] ) ) ? '<div class="description field-desc">' . $field['description'] . '</div>' : '';
1795+
echo ( isset( $field['description'] ) && $field['type'] != "info" && $field['type'] != "group" && !empty( $field['description'] ) ) ? '<div class="description field-desc">' . $field['description'] . '</div>' : '';
17961796

17971797
echo '</fieldset>';
17981798

‎inc/fields/color/field_color.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.

‎inc/fields/date/field_date.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/*global jQuery*/
22

33
jQuery(document).ready(function () {
4-
jQuery('.redux-datepicker').datepicker();
4+
jQuery('.redux-datepicker').each(function(){
5+
jQuery(this).datepicker();
6+
});
57
});

‎inc/fields/date/field_date.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.

‎inc/fields/dimensions/field_dimensions.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ jQuery(document).ready(function() {
1010

1111
jQuery('.redux-dimensions-input').on('change', function() {
1212
var units = jQuery(this).parents('.redux-field:first').find('.redux-dimensions-units option:selected').val();
13-
var id = jQuery(this).attr('rel');
14-
jQuery('#'+id).val(jQuery(this).val()+units);
13+
if(typeof units !== 'undefined') {
14+
jQuery('#'+jQuery(this).attr('rel')).val(jQuery(this).val()+units);
15+
} else {
16+
jQuery('#'+jQuery(this).attr('rel')).val(jQuery(this).val());
17+
}
1518
});
1619

1720
jQuery('.redux-dimensions-units').on('change', function() {

0 commit comments

Comments
 (0)