Merge pull request #330 from contactashish13/testing3.1.0

Testing3.1.0

Author: contactashish13

classes/Visualizer/Module.php

@@ -452,11 +452,15 @@ protected function load_chart_type( $chart_id ) {
 		$type   = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
 		$name   = 'Visualizer_Render_Sidebar_Type_' . ucwords( $type );
 		$class  = null;
-		if ( class_exists( $name ) ) {
+		if ( class_exists( $name ) || true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
 			$class  = new $name;
-		} elseif ( true === apply_filters( 'visualizer_load_chart', false, $name ) ) {
-			$class = new $name;
 		}
+
+		if ( is_null( $class ) && VISUALIZER_PRO ) {
+			// lets see if this type exists in pro. New Lite(3.1.0+) & old Pro(1.8.0-).
+			$class  = apply_filters( 'visualizer_pro_chart_type_sidebar', null, array( 'type' => $type, 'settings' => get_post_meta( $chart_id, Visualizer_Plugin::CF_SETTINGS, true ) ) );
+		}
+
 		return is_null( $class ) ? null : $class->getLibrary();
 	}
 

classes/Visualizer/Plugin.php

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

classes/Visualizer/Render/Layout.php

@@ -71,18 +71,18 @@ public static function _renderDbQuery( $args ) {
 					<form id='db-query-form'>
 						<textarea name='query' class='visualizer-db-query' placeholder="<?php _e( 'Your query goes here', 'visualizer' ); ?>"><?php echo $query; ?></textarea>
 					</form>
+					<div class='db-wizard-error'></div>
 				</div>
 				<div>
 					<input type="button" class="button button-primary" id='visualizer-query-fetch' value='<?php _e( 'Show Results', 'visualizer' ); ?>'>
 				</div>
 			</div>
 			<div class='db-wizard-hints'>
 				<ul>
-					<li><?php echo sprintf( __( 'For examples of pre-built queries that you can use, please click %1$shere%2$s', 'visualizer' ), '<a href="' . VISUALIZER_DB_QUERY_DOC_URL . '" target="_blank">', '</a>' ); ?></li>
-					<li><?php echo sprintf( __( 'Use %1$sControl+Space%2$s for autocompleting keywords or tables/columns.', 'visualizer' ), '<span class="visualizer-emboss">', '</span>' ); ?></li>
+					<li><?php echo sprintf( __( 'For examples of queries and links to resources that you can use with this feature, please click %1$shere%2$s', 'visualizer' ), '<a href="' . VISUALIZER_DB_QUERY_DOC_URL . '" target="_blank">', '</a>' ); ?></li>
+					<li><?php echo sprintf( __( 'Use %1$sControl+Space%2$s for autocompleting keywords or table names.', 'visualizer' ), '<span class="visualizer-emboss">', '</span>' ); ?></li>
 				</ul>
 			</div>
-			<div class='db-wizard-error'></div>
 			<div class='db-wizard-results'></div>
 
 		</div>

css/frame.css

@@ -6,7 +6,7 @@
 	right: 0;
 	bottom: 60px;
 	left: 0;
-	width: calc(100% - 300px);
+	width: auto;
 	background-color: white;
 }
 

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 3.0.12
+	Version: 3.1.0
 */
 #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.0.12
+	Version: 3.1.0
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

js/frame.js

@@ -19,7 +19,7 @@
 
         init_permissions();
 
-        if(visualizer.is_pro) {
+        if(typeof visualizer !== 'undefined' && visualizer.is_pro) {
             init_db_import();
         }
 
@@ -261,6 +261,7 @@
         });
 
         $( '#db-chart-button' ).on( 'click', function(){
+            $('#content').css('width', 'calc(100% - 300px)');
             if( $(this).attr( 'data-current' ) === 'chart'){
                 $(this).val( $(this).attr( 'data-t-filter' ) );
                 $(this).html( $(this).attr( 'data-t-filter' ) );

js/render-datatables.js

@@ -23,9 +23,10 @@
             return;
         }
 
-        if($('#' + id).find('table.dataTable').length === 0){
-            $('#' + id).append($('<table class="dataTable table table-striped"></table>'));
+        if($('#' + id).find('table.visualizer-data-table').length > 0){
+            $('#' + id).empty();
         }
+        $('#' + id).append($('<table class="dataTable visualizer-data-table table table-striped"></table>'));
 
         settings = {
             destroy: true,
@@ -121,7 +122,7 @@
                     break;
             }
 
-            render = addRenderer(series[j].type, settings.series[j]);
+            render = addRenderer(series[j].type, settings.series, j);
 
             var col = { title: series[j].label, data: series[j].label, type: type, render: render };
             if(typeof chart.settings['cssClassNames'] !== 'undefined' && typeof chart.settings['cssClassNames']['tableCell'] !== 'undefined'){
@@ -143,7 +144,7 @@
         // allow user to extend the settings.
         $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings});
 
-        table = $('#' + id + ' table.dataTable');
+        table = $('#' + id + ' table.visualizer-data-table');
         table.DataTable( {
             data: rows,
             columns: cols,
@@ -152,12 +153,14 @@
         $('.loader').remove();
     }
 
-    function addRenderer(type, series){
+    function addRenderer(type, series, index){
         var render = null;
-        if(typeof series === 'undefined' || typeof series.format === 'undefined'){
+        if(typeof series === 'undefined' || typeof series[index] === 'undefined' || typeof series[index].format === 'undefined' ){
             return render;
         }
 
+        series = series[index];
+
         /* jshint ignore:start */
         switch(type){
             case 'number':

package.json

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