Merge pull request #91 from contactashish13/development

Export doesn't work #29

Author: selul

classes/Visualizer/Render/Sidebar/Columnar.php

@@ -78,4 +78,39 @@ protected function _renderColumnarSettings() {
 		self::_renderGroupEnd();
 	}
 
+
+	/**
+	 * Renders general settings block for vertical axis settings.
+	 *
+	 * @since 1.4.0
+	 *
+	 * @access protected
+	 */
+	protected function _renderVerticalAxisGeneralSettings() {
+        parent::_renderVerticalAxisGeneralSettings();
+		self::_renderColorPickerItem(
+			esc_html__( 'Axis Text Color', Visualizer_Plugin::NAME ),
+			'hAxis[textStyle]',
+			isset( $this->hAxis['textStyle'] ) ? $this->hAxis['textStyle'] : null,
+			'#000'
+		);
+    }
+
+	/**
+	 * Renders general settings block for vertical axis settings.
+	 *
+	 * @since 1.4.0
+	 *
+	 * @access protected
+	 */
+	protected function _renderHorizontalAxisGeneralSettings() {
+        parent::_renderHorizontalAxisGeneralSettings();
+		self::_renderColorPickerItem(
+			esc_html__( 'Axis Text Color', Visualizer_Plugin::NAME ),
+			'vAxis[textStyle]',
+			isset( $this->vAxis['textStyle'] ) ? $this->vAxis['textStyle'] : null,
+			'#000'
+		);
+    }
+
 }

classes/Visualizer/Render/Sidebar/Graph.php

@@ -133,7 +133,7 @@ protected function _renderChartTitleSettings() {
 	 *
 	 * @access protected
 	 */
-	protected function _renderHorizontalAxisGeneratSettings() {
+	protected function _renderHorizontalAxisGeneralSettings() {
 		self::_renderTextItem(
 			esc_html__( 'Axis Title', Visualizer_Plugin::NAME ),
 			'hAxis[title]',
@@ -179,7 +179,7 @@ protected function _renderHorizontalAxisGeneratSettings() {
 	protected function _renderHorizontalAxisSettings() {
 		self::_renderGroupStart( esc_html__( 'Horizontal Axis Settings', Visualizer_Plugin::NAME ) );
 			self::_renderSectionStart( esc_html__( 'General Settings', Visualizer_Plugin::NAME ), false );
-				$this->_renderHorizontalAxisGeneratSettings();
+				$this->_renderHorizontalAxisGeneralSettings();
 			self::_renderSectionEnd();
 
 			if ( $this->_horizontalGridLines ) {

classes/Visualizer/Render/Sidebar/Linear.php

@@ -91,8 +91,16 @@ public function __construct( $data = array() ) {
 	 *
 	 * @access protected
 	 */
-	protected function _renderHorizontalAxisGeneratSettings() {
-		parent::_renderHorizontalAxisGeneratSettings();
+	protected function _renderHorizontalAxisGeneralSettings() {
+		parent::_renderHorizontalAxisGeneralSettings();
+
+		self::_renderColorPickerItem(
+			esc_html__( 'Axis Text Color', Visualizer_Plugin::NAME ),
+			'vAxis[textStyle]',
+			isset( $this->vAxis['textStyle'] ) ? $this->vAxis['textStyle'] : null,
+			'#000'
+		);
+
 		$this->_renderHorizontalAxisFormatField();
 	}
 
@@ -105,6 +113,14 @@ protected function _renderHorizontalAxisGeneratSettings() {
 	 */
 	protected function _renderVerticalAxisGeneralSettings() {
 		parent::_renderVerticalAxisGeneralSettings();
+
+		self::_renderColorPickerItem(
+			esc_html__( 'Axis Text Color', Visualizer_Plugin::NAME ),
+			'hAxis[textStyle]',
+			isset( $this->hAxis['textStyle'] ) ? $this->hAxis['textStyle'] : null,
+			'#000'
+		);
+
 		$this->_renderVerticalAxisFormatField();
 	}
 

classes/Visualizer/Render/Sidebar/Type/Bar.php

@@ -54,8 +54,8 @@ public function __construct( $data = array( ) ) {
 	 *
 	 * @access protected
 	 */
-	protected function _renderHorizontalAxisGeneratSettings() {
-		parent::_renderHorizontalAxisGeneratSettings();
+	protected function _renderHorizontalAxisGeneralSettings() {
+		parent::_renderHorizontalAxisGeneralSettings();
 		$this->_renderHorizontalAxisFormatField();
 	}
 

js/library.js

@@ -98,7 +98,9 @@
                     a.href = url;
                     a.download = data.data.name;
                     a.click();
-                    window.URL.revokeObjectURL(url);
+                    setTimeout(function(){
+                        window.URL.revokeObjectURL(url);
+                    }, 100);
                 }
             });
             return false;

js/render.js

@@ -132,6 +132,18 @@
 			}
 		}
 
+        if(settings.hAxis){
+            if(settings.hAxis.textStyle && settings.hAxis.textStyle != ''){
+                settings.hAxis.textStyle = {color: settings.hAxis.textStyle};
+            }
+        }
+
+        if(settings.vAxis){
+            if(settings.vAxis.textStyle && settings.vAxis.textStyle != ''){
+                settings.vAxis.textStyle = {color: settings.vAxis.textStyle};
+            }
+        }
+
         for (i = 0; i < data.length; i++) {
 			row = [];
 			for (j = 0; j < series.length; j++) {