Merge pull request #216 from Codeinwp/development

Adds compatibility with WordPress 4.9.

Author: selul

Gruntfile.js

@@ -6,5 +6,10 @@ module.exports = function (grunt) {
 
 	var loader = require( 'load-project-config' ),
 		config = require( 'grunt-plugin-fleet' );
+	config = config();
+	// jshint ignore: start
+	config.taskMap['faq_builder'] = 'grunt-helpscout-faq';
+	// jshint ignore: end
+	loader(grunt, config).init();
 	loader( grunt, config ).init();
 };

classes/Visualizer/Module/Frontend.php

@@ -169,13 +169,14 @@ public function enqueueScripts() {
 	 * @param array $atts The array of shortcode attributes.
 	 */
 	public function renderChart( $atts ) {
+		global $wp_version;
 		$atts = shortcode_atts(
 			array(
 				'id'     => false, // chart id
-			'class'  => false, // chart class
-			'series' => false, // series filter hook
-			'data'   => false, // data filter hook
-			'settings'   => false, // data filter hook
+				'class'  => false, // chart class
+				'series' => false, // series filter hook
+				'data'   => false, // data filter hook
+				'settings'   => false, // data filter hook
 			), $atts
 		);
 
@@ -239,7 +240,7 @@ public function renderChart( $atts ) {
 			'visualizer-render', 'visualizer', array(
 				'charts'        => $this->_charts,
 				'map_api_key'   => get_option( 'visualizer-map-api-key' ),
-				'rest_url'      => rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ),
+				'rest_url'      => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
 				'i10n'          => array(
 					'copied'        => __( 'Copied!', 'visualizer' ),
 				),

classes/Visualizer/Plugin.php

@@ -28,7 +28,7 @@
 class Visualizer_Plugin {
 
 	const NAME = 'visualizer';
-	const VERSION = '3.0.2';
+	const VERSION = '3.0.3';
 
 	// custom post types
 	const CPT_VISUALIZER = 'visualizer';

classes/Visualizer/Render/Sidebar.php

@@ -157,7 +157,7 @@ protected function _renderAdvancedSettings() {
 
 		self::_renderGroupStart( esc_html__( 'Manual Configuration', 'visualizer' ) );
 			self::_renderSectionStart();
-				self::_renderSectionDescription( __( 'Configure the graph by providing configuration variables right from the','visualizer' ) . ' <a href="https://developers.google.com/chart/interactive/docs/reference" target="_blank">Google Visualization</a> API.' );
+				self::_renderSectionDescription( __( 'Configure the graph by providing configuration variables right from the', 'visualizer' ) . ' <a href="https://developers.google.com/chart/interactive/docs/reference" target="_blank">Google Visualization</a> API.' );
 
 			$example    = '
 {
@@ -192,20 +192,24 @@ protected function _renderAdvancedSettings() {
 	 * @access protected
 	 */
 	protected function _renderActionSettings() {
+		global $wp_version;
+		$disable_actions    = version_compare( $wp_version, '4.7.0', '<' );
 		self::_renderSectionStart( esc_html__( 'Actions', 'visualizer' ), false );
 			self::_renderCheckboxItem(
 				esc_html__( 'Print', 'visualizer' ),
 				'actions[]',
 				isset( $this->actions ) && in_array( 'print', $this->actions ) ? true : false,
 				'print',
-				esc_html__( 'To enable printing the data.', 'visualizer' )
+				$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable printing the data.', 'visualizer' ),
+				$disable_actions
 			);
 			self::_renderCheckboxItem(
 				esc_html__( 'CSV', 'visualizer' ),
 				'actions[]',
 				isset( $this->actions ) && in_array( 'csv;application/csv', $this->actions ) ? true : false,
 				'csv;application/csv',
-				esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' )
+				$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as a CSV.', 'visualizer' ),
+				$disable_actions
 			);
 
 			$disabled   = ! ( class_exists( 'PHPExcel' ) && extension_loaded( 'zip' ) && extension_loaded( 'xml' ) && version_compare( PHP_VERSION, '5.2.0', '>' ) );
@@ -214,15 +218,16 @@ protected function _renderActionSettings() {
 				'actions[]',
 				isset( $this->actions ) && in_array( 'xls;application/vnd.ms-excel', $this->actions ) ? true : false,
 				'xls;application/vnd.ms-excel',
-				$disabled ? '<span class="viz-section-error">' . esc_html__( 'Enable the ZIP and XML extensions to use this setting.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as an Excel spreadsheet.', 'visualizer' ),
-				$disabled
+				$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : ( $disabled ? '<span class="viz-section-error">' . esc_html__( 'Enable the ZIP and XML extensions to use this setting.', 'visualizer' ) . '</span>' : esc_html__( 'To enable downloading the data as an Excel spreadsheet.', 'visualizer' ) ),
+				$disable_actions || $disabled
 			);
 			self::_renderCheckboxItem(
 				esc_html__( 'Copy', 'visualizer' ),
 				'actions[]',
 				isset( $this->actions ) && in_array( 'copy', $this->actions ) ? true : false,
 				'copy',
-				esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' )
+				$disable_actions ? '<span class="viz-section-error">' . esc_html__( 'Upgrade to at least WordPress 4.7 to use this.', 'visualizer' ) . '</span>' : esc_html__( 'To enable copying the data to the clipboard.', 'visualizer' ),
+				$disable_actions
 			);
 		self::_renderSectionEnd();
 	}
@@ -663,7 +668,7 @@ protected static function _renderCheckboxItem( $title, $name, $value, $default,
 		echo '<div class="viz-section-item">';
 			echo '<a class="more-info" href="javascript:;">[?]</a>';
 			echo '<b>', $title, '</b>';
-			echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ($value == $default ? 'checked' : ''), ' ', ($disabled ? 'disabled=disabled' : ''), '>';
+			echo '<input type="checkbox" class="control-check" value="', $default, '" name="', $name, '" ', ( $value == $default ? 'checked' : '' ), ' ', ( $disabled ? 'disabled=disabled' : '' ), '>';
 			echo '<p class="viz-section-description">', $desc, '</p>';
 		echo '</div>';
 	}

classes/Visualizer/Render/Sidebar/Graph.php

@@ -426,12 +426,12 @@ protected function _renderHorizontalAxisFormatField() {
 				'%s<br><br>%s<br><br>%s',
 				esc_html__( 'Enter custom format pattern to apply to horizontal axis labels.', 'visualizer' ),
 				sprintf(
-					esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.','visualizer' ),
+					esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.', 'visualizer' ),
 					'<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">',
 					'</a>'
 				),
 				sprintf(
-					esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.','visualizer' ),
+					esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ),
 					'<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">',
 					'</a>'
 				)
@@ -455,12 +455,12 @@ protected function _renderVerticalAxisFormatField() {
 				'%s<br><br>%s<br><br>%s',
 				esc_html__( 'Enter custom format pattern to apply to vertical axis labels.', 'visualizer' ),
 				sprintf(
-					esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.','visualizer' ),
+					esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.', 'visualizer' ),
 					'<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">',
 					'</a>'
 				),
 				sprintf(
-					esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.','visualizer' ),
+					esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ),
 					'<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">',
 					'</a>'
 				)

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

@@ -73,7 +73,7 @@ protected function _renderMapSettings() {
 
 			self::_renderSectionStart( esc_html__( 'Region', 'visualizer' ), false );
 				self::_renderSectionDescription(
-					esc_html__( 'Configure the region area to display on the map. (Surrounding areas will be displayed as well.) Can be one of the following:' , 'visualizer' ) .
+					esc_html__( 'Configure the region area to display on the map. (Surrounding areas will be displayed as well.) Can be one of the following:', 'visualizer' ) .
 					'<ul>' .
 						'<li>' . esc_html__( "'world' - A map of the entire world.", 'visualizer' ) . '</li>' .
 						'<li>' . sprintf( esc_html__( "A continent or a sub-continent, specified by its %s code, e.g., '011' for Western Africa.", 'visualizer' ), '<a href="https://google-developers.appspot.com/chart/interactive/docs/gallery/geochart#Continent_Hierarchy" target="_blank">3-digit</a>' ) . '</li>' .

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

@@ -65,12 +65,12 @@ protected function _renderPieSettings() {
 						'%s<br><br>%s<br><br>%s',
 						esc_html__( 'Enter custom format pattern to apply to horizontal axis labels.', 'visualizer' ),
 						sprintf(
-							esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.','visualizer' ),
+							esc_html__( 'For number axis labels, this is a subset of the decimal formatting %1$sICU pattern set%2$s. For instance, $#,###.## will display values $1,234.56 for value 1234.56. Pay attention that if you use #&#37;&#37; percentage format then your values will be multiplied by 100.', 'visualizer' ),
 							'<a href="http://icu-project.org/apiref/icu4c/classDecimalFormat.html#_details" target="_blank">',
 							'</a>'
 						),
 						sprintf(
-							esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.','visualizer' ),
+							esc_html__( 'For date axis labels, this is a subset of the date formatting %1$sICU date and time format%2$s.', 'visualizer' ),
 							'<a href="http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax" target="_blank">',
 							'</a>'
 						)

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 3.0.2
+	Version: 3.0.3
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;

grunt/faq_builder.js

@@ -0,0 +1,14 @@
+/**
+ * Faq builder for Grunt
+ */
+//jshint ignore: start
+module.exports = {
+	options: {
+		filename: 'readme.txt',
+		api_key: 'e2a5c1a75f6132ced80bb05ee445a76ffa7fc430',
+		collection_id: '561ec249c69791452ed4bceb',
+		category_id: '596e5c5f2c7d3a73488b33ec',
+		template: "= {article_title} = \n [{article_link}]({article_link}) \n\n ",
+	},
+	helpscout: {},
+};

index.php

@@ -4,7 +4,7 @@
 	Plugin Name: Visualizer: Charts and Graphs Lite
 	Plugin URI: https://themeisle.com/plugins/visualizer-charts-and-graphs-lite/
 	Description: A simple, easy to use and quite powerful tool to create, manage and embed interactive charts into your WordPress posts and pages. The plugin uses Google Visualization API to render charts, which supports cross-browser compatibility (adopting VML for older IE versions) and cross-platform portability to iOS and new Android releases.
-	Version: 3.0.2
+	Version: 3.0.3
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later