PR comments

https://github.com/Codeinwp/visualizer-pro/pull/133#issuecomment-440444940

Author: contactashish13

classes/Visualizer/Module.php

@@ -519,4 +519,24 @@ private function handle_css_property( $property, $value ) {
 		return $property . ': ' . $value;
 	}
 
+	/**
+	 * Determines if charts have been created of the particular chart type.
+	 */
+	protected static function hasChartType( $type ) {
+		$args = array(
+			'post_type'      => Visualizer_Plugin::CPT_VISUALIZER,
+			'fields'        => 'ids',
+			'post_status'   => 'publish',
+			'meta_query'    => array(
+				array(
+					'key'       => Visualizer_Plugin::CF_CHART_TYPE,
+					'value'     => $type,
+				),
+			),
+		);
+
+		$q = new WP_Query( $args );
+		return $q->found_posts > 0;
+	}
+
 }

classes/Visualizer/Module/Admin.php

@@ -53,7 +53,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		parent::__construct( $plugin );
 		$this->_addAction( 'load-post.php', 'enqueueMediaScripts' );
 		$this->_addAction( 'load-post-new.php', 'enqueueMediaScripts' );
-		$this->_addAction( 'admin_footer', 'renderTempaltes' );
+		$this->_addAction( 'admin_footer', 'renderTemplates' );
 		$this->_addAction( 'admin_enqueue_scripts', 'enqueueLibraryScripts', null, 8 );
 		$this->_addAction( 'admin_menu', 'registerAdminMenu' );
 		$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
@@ -278,7 +278,7 @@ public function setupMediaViewStrings( $strings ) {
 	 * @access private
 	 * @return array The associated array of chart types with localized names.
 	 */
-	public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false ) {
+	public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darray = false, $add_select = false, $where = null ) {
 		$additional = array();
 		if ( $add_select ) {
 			$additional['select'] = array(
@@ -372,6 +372,45 @@ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darra
 			$types = $doubleD;
 		}
 
+		return self::handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where );
+	}
+
+	/**
+	 * Handle (soon-to-be) deprecated charts.
+	 */
+	private static function handleDeprecatedCharts( $types, $enabledOnly, $get2Darray, $where ) {
+		$deprecated = array();
+
+		switch ( $where ) {
+			case 'library':
+				// if the user has a Google Table chart, show it as deprecated otherwise remove the option from the library.
+				if ( ! self::hasChartType( 'table' ) ) {
+					$deprecated[]   = 'table';
+					if ( $get2Darray ) {
+						$types['dataTable'] = esc_html__( 'Table', 'visualizer' );
+					} else {
+						$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
+					}
+				}
+				break;
+			default:
+				// remove the option to create a Google Table chart.
+				if ( self::hasChartType( 'table' ) ) {
+					$deprecated[]   = 'table';
+					if ( $get2Darray ) {
+						$types['dataTable'] = esc_html__( 'Table', 'visualizer' );
+					} else {
+						$types['dataTable']['name'] = esc_html__( 'Table', 'visualizer' );
+					}
+				}
+		}
+
+		if ( $deprecated ) {
+			foreach ( $deprecated as $type ) {
+				unset( $types[ $type ] );
+			}
+		}
+
 		return $types;
 	}
 
@@ -383,7 +422,7 @@ public static function _getChartTypesLocalized( $enabledOnly = false, $get2Darra
 	 *
 	 * @access public
 	 */
-	public function renderTempaltes() {
+	public function renderTemplates() {
 		global $pagenow;
 		if ( 'post.php' != $pagenow && 'post-new.php' != $pagenow ) {
 			return;
@@ -628,7 +667,7 @@ public function renderLibraryPage() {
 		$render             = new Visualizer_Render_Library();
 		$render->charts     = $charts;
 		$render->type       = $filter;
-		$render->types      = self::_getChartTypesLocalized();
+		$render->types      = self::_getChartTypesLocalized( false, false, false, true );
 		$render->custom_css     = $css;
 		$render->pagination = paginate_links(
 			array(

css/frame.css

@@ -484,7 +484,7 @@ div.viz-group-content .viz-group-description {
 	background-position: -600px -225px;
 }
 
-.type-box-htmltable .type-label {
+.type-box-dataTable .type-label {
 	background-position: -301px -670px;
 }
 

js/render-datatables.js

@@ -73,14 +73,16 @@
         };
         $.extend( settings, { select } ); // jshint ignore:line
 
+        var stripe = ['', ''];
+
         // in preview mode, cssClassNames will not exist when a color is changed.
         if(typeof chart.settings['cssClassNames'] !== 'undefined'){
             if(typeof chart.settings['cssClassNames']['oddTableRow'] !== 'undefined'){
-                $.extend($.fn.dataTable.ext.classes, { sStripeOdd: chart.settings['cssClassNames']['oddTableRow'] } );
+                stripe[0] = chart.settings['cssClassNames']['oddTableRow'];
             }
 
             if(typeof chart.settings['cssClassNames']['evenTableRow'] !== 'undefined'){
-                $.extend($.fn.dataTable.ext.classes, { sStripeEven: chart.settings['cssClassNames']['evenTableRow'] } );
+                stripe[1] = chart.settings['cssClassNames']['evenTableRow'];
             }
 
             if(typeof chart.settings['cssClassNames']['selectedTableItem'] !== 'undefined'){
@@ -123,7 +125,9 @@
         table.DataTable( {
             data: rows,
             columns: cols,
+            stripeClasses: stripe,
         } );
+
     }
 
     function render(v) {