Merge pull request #337 from contactashish13/release3.1.1

Release3.1.1

Author: contactashish13

classes/Visualizer/Module/Admin.php

@@ -321,14 +321,14 @@ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darra
 					'name'    => esc_html__( 'Column', 'visualizer' ),
 					'enabled' => true,
 				),
-				'gauge'       => array(
-					'name'    => esc_html__( 'Gauge', 'visualizer' ),
-					'enabled' => true,
-				),
 				'scatter'     => array(
 					'name'    => esc_html__( 'Scatter', 'visualizer' ),
 					'enabled' => true,
 				),
+				'gauge'       => array(
+					'name'    => esc_html__( 'Gauge', 'visualizer' ),
+					'enabled' => true,
+				),
 				'candlestick' => array(
 					'name'    => esc_html__( 'Candlestick', 'visualizer' ),
 					'enabled' => true,
@@ -399,10 +399,18 @@ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darra
 				// if a user has a Gauge/Candlestick chart, then let them keep using it.
 				if ( ! VISUALIZER_PRO ) {
 					if ( ! self::hasChartType( 'gauge' ) ) {
-						$deprecated[]   = 'gauge';
+						if ( $get2Darray ) {
+							$deprecated[]   = 'gauge';
+						} else {
+							$types['gauge']['enabled'] = false;
+						}
 					}
 					if ( ! self::hasChartType( 'candlestick' ) ) {
-						$deprecated[]   = 'candlestick';
+						if ( $get2Darray ) {
+							$deprecated[]   = 'candlestick';
+						} else {
+							$types['candlestick']['enabled'] = false;
+						}
 					}
 				}
 				break;
@@ -411,21 +419,27 @@ private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darra
 				$deprecated[]   = 'table';
 
 				// rename the new table chart type.
-				if ( self::hasChartType( 'table' ) ) {
-					if ( $get2Darray ) {
-						$types['dataTable'] = esc_html__( 'Table', 'visualizer' );
-					} else {
-						$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
-					}
+				if ( $get2Darray ) {
+					$types['dataTable'] = esc_html__( 'Table', 'visualizer' );
+				} else {
+					$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
 				}
 
 				// if a user has a Gauge/Candlestick chart, then let them keep using it.
 				if ( ! VISUALIZER_PRO ) {
 					if ( ! self::hasChartType( 'gauge' ) ) {
-						$deprecated[]   = 'gauge';
+						if ( $get2Darray ) {
+							$deprecated[]   = 'gauge';
+						} else {
+							$types['gauge']['enabled'] = false;
+						}
 					}
 					if ( ! self::hasChartType( 'candlestick' ) ) {
-						$deprecated[]   = 'candlestick';
+						if ( $get2Darray ) {
+							$deprecated[]   = 'candlestick';
+						} else {
+							$types['candlestick']['enabled'] = false;
+						}
 					}
 				}
 		}

classes/Visualizer/Plugin.php

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

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

@@ -75,6 +75,10 @@ protected function hooks() {
 	 * @access public
 	 */
 	function load_assets( $deps, $is_frontend ) {
+		if ( ! wp_script_is( 'moment', 'registered' ) ) {
+			wp_register_script( 'moment', '//cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js', array(), Visualizer_Plugin::VERSION );
+		}
+
 		wp_register_script( 'visualizer-datatables', self::$_js, array( 'jquery-ui-core', 'moment' ), Visualizer_Plugin::VERSION );
 		wp_enqueue_style( 'visualizer-datatables', self::$_css, array(), Visualizer_Plugin::VERSION );
 

css/media.css

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

index.php

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Tables and Charts Manager for WordPress (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.1.0
+	Version: 3.1.1
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

package.json

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