Merge pull request #645 from Codeinwp/development

[Fix] Insert chart button in the classic block
[Fix for Pro version] Import from chart did not work

Author: rodica-andronache

classes/Visualizer/Module/Admin.php

@@ -198,9 +198,23 @@ public function init() {
 			$this->_addFilter( 'mce_external_languages', 'add_tinymce_lang', 10, 1 );
 			$this->_addFilter( 'mce_external_plugins', 'tinymce_plugin', 10, 1 );
 			$this->_addFilter( 'mce_buttons', 'register_mce_button', 10, 1 );
+			$this->_addFilter( 'tiny_mce_before_init', 'get_strings_for_block', 10, 1 );
 		}
 	}
 
+	/**
+	 * Add the strings required for the TinyMCE buttons for the classic block (not the classic editor).
+	 *
+	 * @since   ?
+	 * @access  friendly
+	 */
+	function get_strings_for_block( $settings ) {
+		$class = new Visualizer_Module_Language();
+		$strings         = $class->get_strings();
+		$array = array( 'visualizer_tinymce_plugin' => json_encode( $strings ) );
+		return array_merge( $settings, $array );
+	}
+
 	/**
 	 * Load plugin translation for - TinyMCE API
 	 *

classes/Visualizer/Module/Chart.php

@@ -898,6 +898,9 @@ private function handleCSVasString( $data, $editor_type ) {
 				$source = new Visualizer_Source_Csv( $tmpfile );
 				fclose( $handle );
 				break;
+			case 'table':
+				// Import from Chart
+				// fall-through.
 			case 'excel':
 				// data coming in from the excel editor.
 				$source = apply_filters( 'visualizer_pro_handle_chart_data', $data, '' );

classes/Visualizer/Module/Language.php

@@ -68,6 +68,18 @@ public function tinymce_translation() {
 		return $translated;
 	}
 
+	/**
+	 *
+	 * The method that returns the strings array
+	 *
+	 * @since    ?
+	 * @access   public
+	 * @return array
+	 */
+	public function get_strings() {
+		return $this->strings;
+	}
+
 }
 
 $visualizerLangClass = new Visualizer_Module_Language();

classes/Visualizer/Plugin.php

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

css/media.css

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

index.php

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

js/mce.js

@@ -3,8 +3,8 @@
 (function($) {
 	tinymce.PluginManager.add('visualizer_mce_button', function( editor, url ) {
 		editor.addButton( 'visualizer_mce_button', {
-			title: editor.getLang( 'visualizer_tinymce_plugin.plugin_label' ),
-			label: editor.getLang( 'visualizer_tinymce_plugin.plugin_label' ),
+			title: getTranslation( editor, 'plugin_label' ),
+			label: getTranslation( editor, 'plugin_label' ),
 			icon: 'visualizer-icon',
 			onclick: function() {
 				var frame = wp.media({
@@ -16,4 +16,18 @@
 		});
 	});
 
+    /**
+     * Gets the translation from the editor (when classic editor is enabled)
+     * OR
+     * from the settings array inside the editor (when classic block inside gutenberg)
+     */
+    function getTranslation(editor, slug){
+        var string = editor.getLang('visualizer_tinymce_plugin.' + slug);
+        // if the string is the same as the slug being requested for, look in the settings.
+        if(string === '{#visualizer_tinymce_plugin.' + slug + '}'){
+            string = editor.settings.visualizer_tinymce_plugin[slug];
+        }
+        return string;
+    }
+
 })(jQuery);

package.json

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