Export data? #41

Author: contactashish13

classes/Visualizer/Render/Library.php

@@ -55,6 +55,12 @@ private function _renderChartBox( $placeholder_id, $chart_id ) {
 			'type'   => $this->type,
 		), $ajax_url );
 
+        $export_link = add_query_arg( array(
+            'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
+            'chart'  => $chart_id,
+            'security' => wp_create_nonce(Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION),
+        ), admin_url( 'admin-ajax.php' ) );
+
 		echo '<div class="visualizer-chart">';
 			echo '<div id="', $placeholder_id, '" class="visualizer-chart-canvas">';
 				echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
@@ -63,6 +69,7 @@ private function _renderChartBox( $placeholder_id, $chart_id ) {
 				echo '<a class="visualizer-chart-action visualizer-chart-delete" href="', $delete_url, '" title="', esc_attr__( 'Delete', Visualizer_Plugin::NAME ), '" onclick="return showNotice.warn();"></a>';
 				echo '<a class="visualizer-chart-action visualizer-chart-clone" href="', $clone_url, '" title="', esc_attr__( 'Clone', Visualizer_Plugin::NAME ), '"></a>';
 				echo '<a class="visualizer-chart-action visualizer-chart-edit" href="javascript:;" title="', esc_attr__( 'Edit', Visualizer_Plugin::NAME ), '" data-chart="', $chart_id, '"></a>';
+				echo '<a class="visualizer-chart-action visualizer-chart-export" href="javascript:;" title="', esc_attr__( 'Export', Visualizer_Plugin::NAME ), '" data-chart="', $export_link, '"></a>';
 
 				echo '<span class="visualizer-chart-shortcode" title="', esc_attr__( 'Click to select', Visualizer_Plugin::NAME ), '">';
 					echo '&nbsp;[visualizer id=&quot;', $chart_id, '&quot;]&nbsp;';
@@ -134,6 +141,7 @@ private function _renderLibrary() {
 						echo '<span class="visualizer-chart-action visualizer-nochart-delete"></span>';
 						echo '<span class="visualizer-chart-action visualizer-nochart-clone"></span>';
 						echo '<span class="visualizer-chart-action visualizer-nochart-edit"></span>';
+						echo '<span class="visualizer-chart-action visualizer-nochart-export"></span>';
 
 						echo '<span class="visualizer-chart-shortcode">';
 							echo '&nbsp;[visualizer]&nbsp;';

classes/Visualizer/Render/Page/Data.php

@@ -111,14 +111,6 @@ protected function _renderSidebarContent() {
 <?php
                     }
 
-                    $export_link = add_query_arg( array(
-                        'action' => Visualizer_Plugin::ACTION_EXPORT_DATA,
-                        'chart'  => $this->chart->ID,
-                        'security' => wp_create_nonce(Visualizer_Plugin::ACTION_EXPORT_DATA . Visualizer_Plugin::VERSION),
-                    ), admin_url( 'admin-ajax.php' ) );
-?>
-                    <input type="button" class="button" id="export-data" value="<?php esc_attr_e( 'Export Data', Visualizer_Plugin::NAME );?>" data-url="<?php echo $export_link;?>">
-<?php
 					echo'<input type="button" name="advanced_button" class="advanced-settings-btn preview-btn" value="'. __( 'Advanced', Visualizer_Plugin::NAME ).' &raquo;">';
                     // Added by Ash/Upwork
 

css/library.css

@@ -93,6 +93,11 @@
 	background-position: -64px -112px;
 }
 
+.visualizer-nochart-export,
+.visualizer-chart-export {
+    background-position: -46px -64px;
+}
+
 .visualizer-nochart-clone,
 .visualizer-nochart-delete,
 .visualizer-nochart-edit {

js/frame.js

@@ -56,24 +56,6 @@
 			return false;
 		});
 
-        $("#export-data").on("click", function() {
-            $.ajax({
-                url: $(this).attr("data-url"),
-                method: "get",
-                success: function( data, textStatus, jqXHR ){
-                    var a = document.createElement("a");
-                    document.body.appendChild(a);
-                    a.style = "display: none";
-                    var blob = new Blob([data.data.csv], {type: "application/csv"}),
-                    url = window.URL.createObjectURL(blob);
-                    a.href = url;
-                    a.download = data.data.name;
-                    a.click();
-                    window.URL.revokeObjectURL(url);
-                }
-            });
-        });
-
 	});
 })(jQuery);
 

js/library.js

@@ -85,6 +85,25 @@
 			return false;
 		});
 
+        $(".visualizer-chart-export").on("click", function() {
+            $.ajax({
+                url: $(this).attr("data-chart"),
+                method: "get",
+                success: function( data, textStatus, jqXHR ){
+                    var a = document.createElement("a");
+                    document.body.appendChild(a);
+                    a.style = "display: none";
+                    var blob = new Blob([data.data.csv], {type: "application/csv"}),
+                    url = window.URL.createObjectURL(blob);
+                    a.href = url;
+                    a.download = data.data.name;
+                    a.click();
+                    window.URL.revokeObjectURL(url);
+                }
+            });
+            return false;
+        });
+
 		$(window).resize(function() {
 			clearTimeout(resizeTimeout);
 			resizeTimeout = setTimeout(function() {