Merge pull request #279 from Codeinwp/development

Fixed problem with chart reverting to the default values
Fixed problem with Boolean column type
Fixed problem with the Geo chart type not saving colors options

Author: rodica-andronache

classes/Visualizer/Module/Chart.php

@@ -307,9 +307,16 @@ private function _handleDataAndSettingsPage() {
 		if ( $_SERVER['REQUEST_METHOD'] == 'POST' && isset( $_GET['nonce'] ) && wp_verify_nonce( $_GET['nonce'] ) ) {
 			if ( $this->_chart->post_status == 'auto-draft' ) {
 				$this->_chart->post_status = 'publish';
+
+				// ensure that a revision is not created. If a revision is created it will have the proper data and the parent of the revision will have default data.
+				// we do not want any difference in data so disable revisions temporarily.
+				add_filter( 'wp_revisions_to_keep', '__return_false' );
 				wp_update_post( $this->_chart->to_array() );
 			}
-			update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
+			// save meta data only when it is NOT being canceled.
+			if ( ! ( isset( $_POST['cancel'] ) && 1 === intval( $_POST['cancel'] ) ) ) {
+				update_post_meta( $this->_chart->ID, Visualizer_Plugin::CF_SETTINGS, $_POST );
+			}
 			$render       = new Visualizer_Render_Page_Send();
 			$render->text = sprintf( '[visualizer id="%d"]', $this->_chart->ID );
 			wp_iframe( array( $render, 'render' ) );

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '3.0.9';
+	const VERSION = '3.0.10';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';

classes/Visualizer/Render/Sidebar/Type/Geo.php

@@ -224,21 +224,21 @@ protected function _renderColorAxisSettings() {
 				self::_renderColorPickerItem(
 					esc_html__( 'Minimum Value', 'visualizer' ),
 					'colorAxis[colors][]',
-					! empty( $this->colorAxis['color'][0] ) ? $this->colorAxis['color'][0] : null,
+					! empty( $this->colorAxis['colors'][0] ) ? $this->colorAxis['colors'][0] : null,
 					'#efe6dc'
 				);
 
 				self::_renderColorPickerItem(
 					esc_html__( 'Intermediate Value', 'visualizer' ),
 					'colorAxis[colors][]',
-					! empty( $this->colorAxis['color'][1] ) ? $this->colorAxis['color'][1] : null,
+					! empty( $this->colorAxis['colors'][1] ) ? $this->colorAxis['colors'][1] : null,
 					'#82bf7c'
 				);
 
 				self::_renderColorPickerItem(
 					esc_html__( 'Maximum Value', 'visualizer' ),
 					'colorAxis[colors][]',
-					! empty( $this->colorAxis['color'][2] ) ? $this->colorAxis['color'][2] : null,
+					! empty( $this->colorAxis['colors'][2] ) ? $this->colorAxis['colors'][2] : null,
 					'#109618'
 				);
 

classes/Visualizer/Source.php

@@ -208,7 +208,7 @@ protected function _normalizeData( $data ) {
 					$data[ $i ] = ( is_numeric( $data[ $i ] ) ) ? floatval( $data[ $i ] ) : ( is_numeric( str_replace( ',', '', $data[ $i ] ) ) ? floatval( str_replace( ',', '', $data[ $i ] ) ) : null );
 					break;
 				case 'boolean':
-					$data[ $i ] = ! empty( $data[ $i ] ) ? filter_validate( $data[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
+					$data[ $i ] = ! empty( $data[ $i ] ) ? filter_var( $data[ $i ], FILTER_VALIDATE_BOOLEAN ) : null;
 					break;
 				case 'timeofday':
 					$date = new DateTime( '1984-03-16T' . $data[ $i ] );

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 3.0.9
+	Version: 3.0.10
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;

index.php

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Charts and Graphs Lite
 	Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
 	Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
-	Version: 3.0.9
+	Version: 3.0.10
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

package.json

@@ -1,6 +1,6 @@
 {
   "name": "visualizer",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Visualizer Lite",
   "repository": {
     "type": "git",