Bring embedded sources up to date

Author: Ghost1227

framework.php

@@ -738,7 +738,7 @@ public function _enqueue() {
 
 	    wp_enqueue_script('jquery');
 	    wp_enqueue_script('jquery-ui-core');
-        wp_enqueue_style( 'jquery-ui-css' );
+        
 
             wp_register_style(
                 'redux-css',
@@ -781,6 +781,7 @@ public function _enqueue() {
                 time(),
                 'all'
             );
+            wp_enqueue_style( 'jquery-ui-css' );
 
             wp_enqueue_style( 'redux-lte-ie8' );
 

inc/fields/button_set/field_button_set.php

@@ -87,8 +87,6 @@ public function render() {
          * @return      void
          */
         public function enqueue() {
-        
-            wp_enqueue_style( 'jquery-ui-css' );
 
             wp_enqueue_script(
                 'redux-field-button-set-js', 

inc/fields/spacing/field_spacing.js

@@ -19,6 +19,7 @@
 		$('.redux-spacing-input').on('change', function() {
 			var units = jQuery(this).parents('.redux-field:first').find('.redux-spacing-units option:selected').val();
 			if(typeof units !== 'undefined') {
+				console.log(units);
 				jQuery('#'+jQuery(this).attr('rel')).val(jQuery(this).val()+units);
 			} else {
 				jQuery('#'+jQuery(this).attr('rel')).val(jQuery(this).val());

inc/fields/spacing/field_spacing.min.js

@@ -27,6 +27,7 @@ function __construct($field = array(), $value ='', $parent){
 	 * @since ReduxFramework 1.0.0
 	*/
 	function render(){
+		print_r($this->value);
 
 		// No errors please
 		$defaults = array(
@@ -44,7 +45,6 @@ function render(){
 		$defaults = array(
 			'top'=>'',
 			'right'=>'',
-			'mode' => '',
 			'bottom'=>'',
 			'left'=>'',
 			'mode'=>'padding',
@@ -70,13 +70,38 @@ function render(){
 		if ( !empty( $this->field['mode'] ) ) {
 			$this->field['mode'] = $this->field['mode']."-";
 		}
-		
 
+		$oldval = $this->value;
+		$this->value = array();
+
+		foreach ($oldval as $k=>$v) {
+			if ($k == "units") {
+				continue;
+			}
+			if (strpos($k, $this->field['mode']) === false) {
+				$this->value[$k] = str_replace($oldval['units'], "". $v);
+			} else {
+				$this->value[$str_replace($this->field['mode'].'-', "", $k)] = str_replace($oldval['units'], "". $v);
+			}
+		}
+
+		$defaults = array(
+			'top'=>'',
+			'right'=>'',
+			'bottom'=>'',
+			'left'=>'',
+			'units'=>'',
+		);
+
+		$this->value = wp_parse_args( $this->value, $defaults );
+
+
+print_r($this->value);
 			/**
 			Top
 			**/
 			if ($this->field['top'] === true):
-				if ( !empty($this->value['top'] ) &&  strpos( $this->value['top'], $this->value['units'] ) === false ) {
+				if ( !empty( $this->value['top'] ) ) {
 					$this->value['top'] = filter_var($this->value['top'], FILTER_SANITIZE_NUMBER_INT);
 					$this->value['top'] = $this->value['top'].$this->value['units'];
 				}
@@ -87,7 +112,7 @@ function render(){
 			Right
 			**/
 			if ($this->field['right'] === true):
-				if ( !empty($this->value['right'] ) &&  strpos( $this->value['right'], $this->value['units'] ) === false ) {
+				if ( !empty( $this->value['right'] ) ) {
 					$this->value['right'] = filter_var($this->value['right'], FILTER_SANITIZE_NUMBER_INT);
 					$this->value['right'] = $this->value['right'].$this->value['units'];
 				}				
@@ -98,8 +123,11 @@ function render(){
 			Bottom
 			**/
 			if ($this->field['bottom'] === true):
-				if ( !empty($this->value['bottom'] ) &&  strpos( $this->value['bottom'], $this->value['units'] ) === false ) {
+				if ( !empty( $this->value['bottom'] ) ) {
 					$this->value['bottom'] = filter_var($this->value['bottom'], FILTER_SANITIZE_NUMBER_INT);
+					if ($this->field['units'] !== false ) {
+						$this->value['bottom'] .= $this->value['units'];	
+					}					
 					$this->value['bottom'] = $this->value['bottom'].$this->value['units'];
 				}					
 				echo '<div class="field-spacing-input input-prepend"><span class="add-on"><i class="icon-arrow-down icon-large"></i></span><input type="text" class="redux-spacing-bottom redux-spacing-input mini'.$this->field['class'].'" placeholder="'.__('Bottom','redux-framework').'" rel="'.$this->field['id'].'-bottom" value="'.filter_var($this->value['bottom'], FILTER_SANITIZE_NUMBER_INT).'"><input type="hidden" class="redux-spacing-bottom mini'.$this->field['class'].'" placeholder="'.__('Bottom','redux-framework').'" id="'.$this->field['id'].'-bottom" name="'.$this->args['opt_name'].'['.$this->field['id'].']['.$this->field['mode'].'bottom]" value="'.$this->value['bottom'].'"></div>';
@@ -109,7 +137,7 @@ function render(){
 			Left
 			**/
 			if ($this->field['left'] === true):
-				if ( !empty($this->value['left'] ) &&  strpos( $this->value['left'], $this->value['units'] ) === false ) {
+				if ( !empty( $this->value['left'] ) ) {
 					$this->value['left'] = filter_var($this->value['left'], FILTER_SANITIZE_NUMBER_INT);
 					$this->value['left'] = $this->value['left'].$this->value['units'];
 				}									
@@ -121,7 +149,7 @@ function render(){
 			Units
 			**/
 
-			//if ( $this->field['units'] !== false ):
+			if ( $this->field['units'] !== false ):
 
 				echo '<div class="select_wrapper spacing-units" original-title="'.__('Units','redux-framework').'">';
 				echo '<select data-placeholder="'.__('Units','redux-framework').'" class="redux-spacing redux-spacing-units select'.$this->field['class'].'" original-title="'.__('Units','redux-framework').'" name="'.$this->args['opt_name'].'['.$this->field['id'].'][units]" id="'. $this->field['id'].'_units">';
@@ -142,7 +170,7 @@ function render(){
 				}
 				echo '</select></div>';
 
-			//endif;
+			endif;