Merge pull request #630 from contactashish13/issue-610

When new data is imported using csv/url, the manual editor still shows old data

Author: rodica-andronache

classes/Visualizer/Module/Chart.php

@@ -69,6 +69,34 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		$this->_addAjaxAction( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY, 'saveFilter' );
 
+		$this->_addFilter( 'visualizer_get_sidebar', 'getSidebar', 10, 2 );
+
+	}
+
+	/**
+	 * Generates the HTML of the sidebar for the chart.
+	 *
+	 * @since ?
+	 *
+	 * @access public
+	 */
+	public function getSidebar( $sidebar, $chart_id ) {
+		$chart      = get_post( $chart_id );
+		$data          = $this->_getChartArray( $chart );
+		$sidebar       = '';
+		$sidebar_class = $this->load_chart_class_name( $chart_id );
+		if ( class_exists( $sidebar_class, true ) ) {
+			$sidebar           = new $sidebar_class( $data['settings'] );
+			$sidebar->__series = $data['series'];
+			$sidebar->__data   = $data['data'];
+		} else {
+			$sidebar = apply_filters( 'visualizer_pro_chart_type_sidebar', '', $data );
+			if ( $sidebar !== '' ) {
+				$sidebar->__series = $data['series'];
+				$sidebar->__data   = $data['data'];
+			}
+		}
+		return str_replace( "'", '"', $sidebar->__toString() );
 	}
 
 	/**

classes/Visualizer/Render/Page/Update.php

@@ -52,6 +52,9 @@ protected function _toHTML() {
 				echo 'win.visualizer.charts.canvas.settings = ', $this->settings, ';';
 			}
 			echo 'win.visualizer.update();';
+
+			echo $this->updateEditorAndSettings();
+
 			echo '}';
 
 			do_action( 'visualizer_add_update_hook', $this->series, $this->data );
@@ -70,4 +73,21 @@ protected function _toHTML() {
 		echo '</html>';
 	}
 
+
+	/**
+	 * Update the hidden content in the LHS and the advanced settings
+	 */
+	private function updateEditorAndSettings() {
+		$editor = '';
+		if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
+			ob_start();
+			Visualizer_Render_Layout::show( 'simple-editor-screen', $this->id );
+			$editor = ob_get_clean();
+		}
+
+		$sidebar = apply_filters( 'visualizer_get_sidebar', '', $this->id );
+
+		return 'win.updateHTML(\'' . json_encode( $editor ) . '\', \'' . json_encode( $sidebar ) . '\');';
+	}
+
 }

js/frame.js

@@ -69,7 +69,7 @@
         });
 
         // collapse other open sections of this group
-        $('.viz-group-title').click(function () {
+        $(document).on('click', '.viz-group-title', function () {
             var parent = $(this).parent();
 
             if (parent.hasClass('open')) {
@@ -89,7 +89,7 @@
         });
 
         // collapse other open subsections of this section
-        $('.viz-section-title').click(function () {
+        $(document).on('click', '.viz-section-title', function () {
             var grandparent = $(this).parent().parent();
             grandparent.find('.viz-section-title.open ~ .viz-section-items').hide();
             grandparent.find('.viz-section-title.open').removeClass('open');
@@ -124,11 +124,11 @@
             $('#canvas').unlock();
         });
 
-        $('.viz-section-title').click(function () {
+        $(document).on('click', '.viz-section-title', function () {
             $(this).toggleClass('open').parent().find('.viz-section-items').toggle();
         });
 
-        $('.more-info').click(function () {
+        $(document).on('click', '.more-info', function () {
             $(this).parent().find('.viz-section-description:first').toggle();
             return false;
         });

js/preview.js

@@ -4,6 +4,22 @@
 	var timeout;
 
 	$(document).ready(function() {
+        // when data is impported using csv/url, update the hidden data and the advanced settings sidebar.
+        window.updateHTML = function( editor, sidebar ) {
+            $('.viz-simple-editor').remove();
+            $('#content').append(editor);
+            $('#settings-form .viz-group').remove();
+            $('#settings-form').append(sidebar);
+
+            $('#settings-form .control-text').change(updateChart).keyup(updateChart);
+            $('#settings-form .control-select, #settings-form .control-checkbox, #settings-form .control-check').change(updateChart);
+            $('#settings-form .color-picker-hex').wpColorPicker({
+                change: updateChart,
+                clear: updateChart
+            });
+            $('#settings-form textarea[name="manual"]').change(validateJSON).keyup(validateJSON);
+        };
+
         $('#settings-button').click(function() {
 			$('#settings-form').submit();
 		});