Merge pull request #654 from contactashish13/issue-194-pro

Features that show parameters screen on LHS (json, db, editor, wp) cannot be cancelled

Author: rodica-andronache

CHANGELOG.md

@@ -1,4 +1,13 @@
 
+ ### v3.4.2 - 2020-02-17 
+ **Changes:** 
+ * New Cypress tests for the Gutenberg block
+ 
+ ### v3.4.1 - 2020-02-14 
+ **Changes:** 
+ * [Fix] Insert chart button in the classic block
+* [Fix for Pro version] Import from chart did not work
+ 
  ### v3.4.0 - 2020-02-13 
  **Changes:** 
  * [Feat] Support for authentication for JSON import

js/frame.js

@@ -79,13 +79,15 @@
                 parent.addClass('open');
             }
 
-            // if the user wanted to perform an action
-            // and the chart is no longer showing because that particular screen is showing
-            // e.g. create parameters
-            // and then the user decided to click on another action
-            // let's invoke the show chart of the previous action so that the chart shows 
-            // and the user does not get confused
-            $('input[type="button"][data-current!="chart"].show-chart-toggle').trigger('click');
+            /*
+             * if the user wants to perform an action and click that tab to change the source
+             * and the chart is no longer showing because that particular LHS screen is showing
+             * e.g. create parameters, import json, db query box etc.
+             * we need to make sure we cancel the current process WITHOUT saving
+             * and then show the chart as it was
+             * let's close the LHS window and show the chart that is hidden
+             */
+            $('body').trigger('visualizer:change:action');
         });
 
         // collapse other open subsections of this section
@@ -338,6 +340,16 @@
         });
 
         $( '#db-chart-button' ).on( 'click', function(){
+
+            $('body').off('visualizer:change:action').on('visualizer:change:action', function(e){
+                var filter_button = $( '#db-chart-button' );
+                $( '#visualizer-db-query' ).css("z-index", "-1").hide();
+                filter_button.val( filter_button.attr( 'data-t-chart' ) );
+                filter_button.html( filter_button.attr( 'data-t-chart' ) );
+                filter_button.attr( 'data-current', 'chart' );
+                $( '#canvas' ).css("z-index", "1").show();
+            });
+
             $('#content').css('width', 'calc(100% - 300px)');
             if( $(this).attr( 'data-current' ) === 'chart'){
                 $(this).val( $(this).attr( 'data-t-filter' ) );
@@ -390,7 +402,16 @@
 
         // toggle between chart and create/modify parameters
         $( '#json-chart-button' ).on( 'click', function(){
-            var $bttn = $(this);
+
+            $('body').off('visualizer:change:action').on('visualizer:change:action', function(e){
+                var filter_button = $( '#json-chart-button' );
+                $( '#visualizer-json-screen' ).css("z-index", "-1").hide();
+                filter_button.val( filter_button.attr( 'data-t-chart' ) );
+                filter_button.html( filter_button.attr( 'data-t-chart' ) );
+                filter_button.attr( 'data-current', 'chart' );
+                $( '#canvas' ).css("z-index", "1").show();
+            });
+
             $('#content').css('width', 'calc(100% - 100px)');
             if( $(this).attr( 'data-current' ) === 'chart'){
                 // toggle from chart to LHS form

js/simple-editor.js

@@ -24,6 +24,17 @@
 
     function showTextEditor(button) {
         if( button.attr( 'data-current' ) === 'chart'){
+
+            $('body').off('visualizer:change:action').on('visualizer:change:action', function(e){
+                button.val( button.attr( 'data-t-chart' ) );
+                button.html( button.attr( 'data-t-chart' ) );
+                button.attr( 'data-current', 'chart' );
+                $('p.viz-editor-selection').show();
+                $('.viz-text-editor').hide();
+                $('.viz-simple-editor').hide();
+                $( '#canvas' ).css('z-index', '1').show();
+            });
+
             // showing the editor
             button.val( button.attr( 'data-t-editor' ) );
             button.html( button.attr( 'data-t-editor' ) );
@@ -57,6 +68,17 @@
 
     function showTableEditor(button) {
         if( button.attr( 'data-current' ) === 'chart'){
+
+            $('body').off('visualizer:change:action').on('visualizer:change:action', function(e){
+                button.val( button.attr( 'data-t-chart' ) );
+                button.html( button.attr( 'data-t-chart' ) );
+                button.attr( 'data-current', 'chart' );
+                $('p.viz-editor-selection').show();
+                $('.viz-table-editor').hide();
+                $('.viz-simple-editor').hide();
+                $( '#canvas' ).css('z-index', '1').show();
+            });
+
             // showing the editor
             button.val( button.attr( 'data-t-editor' ) );
             button.html( button.attr( 'data-t-editor' ) );

readme.md

@@ -1,6 +1,6 @@
-# Visualizer: Tables and Charts for WordPress #
-**Contributors:** [[codeinwp](https://profiles.wordpress.org/codeinwp)](https://profiles.wordpress.org/[codeinwp](https://profiles.wordpress.org/codeinwp)), [[marius2012](https://profiles.wordpress.org/marius2012)](https://profiles.wordpress.org/[marius2012](https://profiles.wordpress.org/marius2012)), [[marius_codeinwp](https://profiles.wordpress.org/marius_codeinwp)](https://profiles.wordpress.org/[marius_codeinwp](https://profiles.wordpress.org/marius_codeinwp)), [[hardeepasrani](https://profiles.wordpress.org/hardeepasrani)](https://profiles.wordpress.org/[hardeepasrani](https://profiles.wordpress.org/hardeepasrani)), [[themeisle](https://profiles.wordpress.org/themeisle)](https://profiles.wordpress.org/[themeisle](https://profiles.wordpress.org/themeisle)), [[Madalin_ThemeIsle](https://profiles.wordpress.org/Madalin_ThemeIsle)](https://profiles.wordpress.org/[Madalin_ThemeIsle](https://profiles.wordpress.org/Madalin_ThemeIsle)), [[contactashish13](https://profiles.wordpress.org/contactashish13)](https://profiles.wordpress.org/[contactashish13](https://profiles.wordpress.org/contactashish13))  
-**Tags:** tables, charts, pie, visualization, graphs
+# Visualizer: Tables and Charts Manager for WordPress # #
+**Contributors:** [codeinwp](https://profiles.wordpress.org/codeinwp), [marius2012](https://profiles.wordpress.org/marius2012), [marius_codeinwp](https://profiles.wordpress.org/marius_codeinwp), [hardeepasrani](https://profiles.wordpress.org/hardeepasrani), [themeisle](https://profiles.wordpress.org/themeisle), [Madalin_ThemeIsle](https://profiles.wordpress.org/Madalin_ThemeIsle), [contactashish13](https://profiles.wordpress.org/contactashish13)  
+**Tags:** tables, charts, pie, visualization, graphs  
 **Requires at least:** 3.5  
 **Tested up to:** 5.3  
 **Requires PHP:** 5.6  
@@ -11,13 +11,13 @@
 A simple and powerful WordPress chart plugin to create responsive charts & tables and embed them into your site.
 
 ## Description ##
- 
+
 <p><a href="https://themeisle.com/plugins/visualizer-charts-and-graphs/" rel="nofollow">Visualizer: Tables and Charts for WordPress plugin</a> is a powerful and easy to use plugin used to create, manage and embed interactive, responsive charts & tables into your WordPress posts and pages.</p>
 
 The plugin uses Google Visualization API, DataTables.net and ChartJS to add responsive & animated charts, graphs and tables, which support cross-browser compatibility and display perfectly on mobile devices. You can greatly customize all aspects of the charts and tables, and import the data from Excel, CSV, Google Sheets and more!
 
 ### 9 Chart types + 6 more in the pro version ###
-This WordPress graph plugin provides a variety of charts that are optimized to address your WordPress data visualization needs. In the free version, it has line charts, area charts, bar charts, column charts, pie charts, geo charts, table charts, bubble charts, scatter charts. These charts are based on pure HTML5/SVG technology (adopting VML for old IE versions), so no extra plugins are required. Adding these charts to your page can be done in a few simple steps. 
+This WordPress graph plugin provides a variety of charts that are optimized to address your WordPress data visualization needs. In the free version, it has line charts, area charts, bar charts, column charts, pie charts, geo charts, table charts, bubble charts, scatter charts. These charts are based on pure HTML5/SVG technology (adopting VML for old IE versions), so no extra plugins are required. Adding these charts to your page can be done in a few simple steps.
 
 ### One of the best table plugin for wordpress ###
 On top of our responsive charts and graphs, you can also add our responsive tables to your posts and pages, and customize them however you like. Not only can you customize the design of the tables, you can add sorting capabilities, pagination, search and more. You can view a few examples of what can be done <a href="https://demo.themeisle.com/visualizer/table-chart/">here</a>, but many more things can be done, including pricing tables and product tables.
@@ -162,6 +162,17 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 ## Changelog ##
+### 3.4.2 - 2020-02-17  ###
+
+* New Cypress tests for the Gutenberg block
+
+
+### 3.4.1 - 2020-02-14  ###
+
+* [Fix] Insert chart button in the classic block
+* [Fix for Pro version] Import from chart did not work
+
+
 ### 3.4.0 - 2020-02-13  ###
 
 * [Feat] Support for authentication for JSON import
@@ -302,15 +313,15 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 
 * Adds insert button in chart library.
 * Remove frontend assets where they are not needed.
-* Improve non-English charts compatibility. 
+* Improve non-English charts compatibility.
 * Adds a filter to change charts locale.
 
 
 ### 3.0.6 - 2018-02-27  ###
 
-* Fix UTF-8 support while saving the data. 
-* Improve editing experience.  
-* Improves compatibility with Premium version. 
+* Fix UTF-8 support while saving the data.
+* Improve editing experience.
+* Improves compatibility with Premium version.
 * Adds chart button into TinyMCE editor.
 
 
@@ -360,7 +371,7 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 
 ### 2.1.8 - 2017-07-03  ###
 
-* Added chart title into library. 
+* Added chart title into library.
 * Fixed SDK issues with dashboard widget.
 
 

readme.txt

@@ -162,6 +162,17 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 == Changelog ==
+= 3.4.2 - 2020-02-17  = 
+
+* New Cypress tests for the Gutenberg block
+
+
+= 3.4.1 - 2020-02-14  = 
+
+* [Fix] Insert chart button in the classic block
+* [Fix for Pro version] Import from chart did not work
+
+
 = 3.4.0 - 2020-02-13  =
 
 * [Feat] Support for authentication for JSON import

themeisle-hash.json

@@ -1 +1 @@
-{"index.php":"e3217d70f32ef50b1942c9044649aa86"}
+{"index.php":"1c0c5ae1729bc8087c5c2bef281bd2e6"}