Development

.releaserc.yml

@@ -15,6 +15,7 @@ plugins:
   - - "semantic-release-slack-bot"
     - notifyOnSuccess: false
       notifyOnFail: false
+      markdownReleaseNotes: true
       branchesConfig:
         - pattern: master
           notifyOnSuccess: true

CONTRIBUTING.md

@@ -0,0 +1,13 @@
+## Releasing
+
+This repository uses conventional [changelog commit](https://github.com/Codeinwp/conventional-changelog-simple-preset) messages to trigger release
+
+How to release a new version:
+
+- Clone the master branch
+- Do your changes
+- Send a PR to master and merge it using the following subject message
+    - `release: <release short description>` - for patch release
+    - `release(minor): <release short description>` - for minor release
+    - `release(major): <release short description>` - for major release
+      The release notes will inherit the body of the commit message which triggered the release. For more details check the [simple-preset](https://github.com/Codeinwp/conventional-changelog-simple-preset) that we use.

classes/Visualizer/Module/Chart.php

@@ -139,6 +139,10 @@ public function setJsonSchedule() {
 
 		if ( -1 < $time ) {
 			add_post_meta( $chart_id, Visualizer_Plugin::CF_JSON_SCHEDULE, $time );
+			// Update schedules.
+			$schedules              = get_option( Visualizer_Plugin::CF_JSON_SCHEDULE, array() );
+			$schedules[ $chart_id ] = time() + $time * HOUR_IN_SECONDS;
+			update_option( Visualizer_Plugin::CF_JSON_SCHEDULE, $schedules );
 		}
 		wp_send_json_success();
 	}

classes/Visualizer/Module/Frontend.php

@@ -484,13 +484,48 @@ private function addSchema( $id ) {
 			return '';
 		}
 
+		$license = '';
+		if ( isset( $settings['license'] ) && ! empty( $settings['license'] ) ) {
+			$license  = $settings['license'];
+			if ( is_array( $license ) ) {
+				$license  = $settings['license']['text'];
+			}
+		}
+		$license = apply_filters( 'visualizer_schema_license', $license, $id );
+		if ( empty( $license ) ) {
+			if ( $show_errors ) {
+				return "<!-- Not showing structured data for chart $id because license is empty -->";
+			}
+			return '';
+		}
+
+		$creator = '';
+		if ( isset( $settings['creator'] ) && ! empty( $settings['creator'] ) ) {
+			$creator  = $settings['creator'];
+			if ( is_array( $creator ) ) {
+				$creator  = $settings['creator']['text'];
+			}
+		}
+		$creator = apply_filters( 'visualizer_schema_creator', $creator, $id );
+		if ( empty( $creator ) ) {
+			if ( $show_errors ) {
+				return "<!-- Not showing structured data for chart $id because creator is empty -->";
+			}
+			return '';
+		}
+
 		$schema = apply_filters(
 			'visualizer_schema',
 			'{
 			  "@context":"https://schema.org/",
 			  "@type":"Dataset",
 			  "name":"' . esc_html( $title ) . '",
-			  "description":"' . esc_html( $desc ) . '"
+			  "description":"' . esc_html( $desc ) . '",
+			  "license": "' . esc_html( $license ) . '",
+			  "creator": {
+			  	"@type": "Person",
+			  	"name": "' . esc_html( $creator ) . '"
+			  }
 			}',
 			$id
 		);

classes/Visualizer/Render/Sidebar/ChartJS.php

@@ -296,6 +296,20 @@ protected function _renderGeneralSettings() {
 
 			$this->_renderAnimationSettings();
 
+			self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
+			self::_renderTextItem(
+				esc_html__( 'License', 'visualizer' ),
+				'license',
+				$this->license,
+				''
+			);
+			self::_renderTextItem(
+				esc_html__( 'Creator', 'visualizer' ),
+				'creator',
+				$this->creator,
+				''
+			);
+			self::_renderSectionEnd();
 		self::_renderGroupEnd();
 	}
 

classes/Visualizer/Render/Sidebar/Google.php

@@ -208,15 +208,15 @@ protected function _renderGeneralSettings() {
 				self::_renderSelectItem(
 					esc_html__( 'Position', 'visualizer' ),
 					'legend[position]',
-					$this->legend['position'],
+					isset( $this->legend['position'] ) ? $this->legend['position'] : '',
 					$this->_legendPositions,
 					esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' )
 				);
 
 				self::_renderSelectItem(
 					esc_html__( 'Alignment', 'visualizer' ),
 					'legend[alignment]',
-					$this->legend['alignment'],
+					isset( $this->legend['alignment'] ) ? $this->legend['alignment'] : '',
 					$this->_alignments,
 					esc_html__( 'Determines the alignment of the legend.', 'visualizer' )
 				);
@@ -234,7 +234,20 @@ protected function _renderGeneralSettings() {
 			self::_renderSectionEnd();
 
 			$this->_renderAnimationSettings();
-
+			self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
+			self::_renderTextItem(
+				esc_html__( 'License', 'visualizer' ),
+				'license',
+				$this->license,
+				''
+			);
+			self::_renderTextItem(
+				esc_html__( 'Creator', 'visualizer' ),
+				'creator',
+				$this->creator,
+				''
+			);
+			self::_renderSectionEnd();
 			do_action( 'visualizer_chart_settings', get_class( $this ), $this->_data, 'general', array( 'generic' => true ) );
 
 		self::_renderGroupEnd();
@@ -393,10 +406,12 @@ protected function _renderViewSettings() {
 					echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">';
 						echo '<tr>';
 							echo '<td class="viz-section-table-column">';
-								echo '<input type="text" name="chartArea[left]" class="control-text" value="', $this->chartArea['left'] || $this->chartArea['left'] === '0' ? esc_attr( $this->chartArea['left'] ) : '', '" placeholder="20%">';
+								$chartarea_left = isset( $this->chartArea['left'] ) ? $this->chartArea['left'] : '';
+								echo '<input type="text" name="chartArea[left]" class="control-text" value="', $chartarea_left || '0' === $chartarea_left ? esc_attr( $chartarea_left ) : '', '" placeholder="20%">';
 							echo '</td>';
 							echo '<td class="viz-section-table-column">';
-								echo '<input type="text" name="chartArea[top]" class="control-text" value="', $this->chartArea['top'] || $this->chartArea['top'] === '0' ? esc_attr( $this->chartArea['top'] ) : '', '" placeholder="20%">';
+								$chartarea_top = isset( $this->chartArea['top'] ) ? $this->chartArea['top'] : '';
+								echo '<input type="text" name="chartArea[top]" class="control-text" value="', $chartarea_top || '0' === $chartarea_top ? esc_attr( $chartarea_top ) : '', '" placeholder="20%">';
 							echo '</td>';
 						echo '</tr>';
 					echo '</table>';

classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Gauge.php

@@ -78,6 +78,28 @@ protected function _renderGeneralSettings() {
 					$this->title,
 					esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
 				);
+
+				self::_renderTextAreaItem(
+					esc_html__( 'Chart Description', 'visualizer' ),
+					'description',
+					$this->description,
+					sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
+				);
+			self::_renderSectionEnd();
+
+			self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
+			self::_renderTextItem(
+				esc_html__( 'License', 'visualizer' ),
+				'license',
+				$this->license,
+				''
+			);
+			self::_renderTextItem(
+				esc_html__( 'Creator', 'visualizer' ),
+				'creator',
+				$this->creator,
+				''
+			);
 			self::_renderSectionEnd();
 
 		self::_renderGroupEnd();

classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Geo.php

@@ -64,6 +64,27 @@ protected function _renderGeneralSettings() {
 					$this->title,
 					esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
 				);
+				self::_renderTextAreaItem(
+					esc_html__( 'Chart Description', 'visualizer' ),
+					'description',
+					$this->description,
+					sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
+				);
+			self::_renderSectionEnd();
+
+			self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
+			self::_renderTextItem(
+				esc_html__( 'License', 'visualizer' ),
+				'license',
+				$this->license,
+				''
+			);
+			self::_renderTextItem(
+				esc_html__( 'Creator', 'visualizer' ),
+				'creator',
+				$this->creator,
+				''
+			);
 			self::_renderSectionEnd();
 		self::_renderGroupEnd();
 	}

classes/Visualizer/Render/Sidebar/Type/GoogleCharts/Tabular.php

@@ -73,8 +73,28 @@ protected function _renderGeneralSettings() {
 					$this->title,
 					esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
 				);
+				self::_renderTextAreaItem(
+					esc_html__( 'Chart Description', 'visualizer' ),
+					'description',
+					$this->description,
+					sprintf( esc_html__( 'Description to display in the structured data schema as explained %1$shere%2$s', 'visualizer' ), '<a href="https://developers.google.com/search/docs/data-types/dataset#dataset" target="_blank">', '</a>' )
+				);
 			self::_renderSectionEnd();
-		self::_renderGroupEnd();
+
+			self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false );
+				self::_renderTextItem(
+					esc_html__( 'License', 'visualizer' ),
+					'license',
+					$this->license,
+					''
+				);
+				self::_renderTextItem(
+					esc_html__( 'Creator', 'visualizer' ),
+					'creator',
+					$this->creator,
+					''
+				);
+			self::_renderGroupEnd();
 	}
 
 	/**

classes/Visualizer/Source.php

@@ -335,7 +335,7 @@ public static final function get_date_formats_if_exists( $series, $data ) {
 	 *
 	 * @return string|null
 	 */
-	private static final function determine_date_format( $value, $type ) {
+	private static function determine_date_format( $value, $type ) {
 		if ( version_compare( phpversion(), '5.3.0', '<' ) ) {
 			do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'PHP version %s not supported', phpversion() ), 'error', __FILE__, __LINE__ );
 			return null;

js/media.js

@@ -5,7 +5,7 @@
 	wpmvtv = wpmv.toolbar.visualizer;
 	mediaFrame = wpmv.MediaFrame.Post;
 
-	g.charts.load("current", { packages: ["corechart", "geochart", "gauge", "table", "timeline"] });
+	g.load('visualization', 'current', { packages: ["corechart", "geochart", "gauge", "table", "timeline"] });
 
 	wpmv.MediaFrame.Post = mediaFrame.extend({
 		initialize: function() {

js/render-google.js

@@ -451,14 +451,15 @@ var __visualizer_chart_images   = [];
         }
 
         objects = {};
-        google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
-        google.charts.setOnLoadCallback(function() {
-            gv = google.visualization;
-            all_charts = v.charts;
-            if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
-                renderChart(v.id);
-            } else {
-                render();
+        google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
+            callback: function () {
+                gv = google.visualization;
+                all_charts = v.charts;
+                if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
+                    renderChart(v.id);
+                } else {
+                    render();
+                }
             }
         });
     });