Merge remote-tracking branch 'refs/remotes/Codeinwp/master' into issue-240

Author: contactashish13

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+ ### v3.0.7 - 2018-03-26 
+ **Changes:** 
+ * Adds insert button in chart library.
+* Remove frontend assets where they are not needed.
+* Improve non-English charts compatibility. 
+* Adds a filter to change charts locale.
+ 
  ### v3.0.6 - 2018-02-27 
  **Changes:** 
  * Fix UTF-8 support while saving the data. 

classes/Visualizer/Module/Admin.php

@@ -157,6 +157,13 @@ public function enqueueMediaScripts() {
 			wp_enqueue_script( 'visualizer-media-collection', VISUALIZER_ABSURL . 'js/media/collection.js', array( 'visualizer-media-model' ), Visualizer_Plugin::VERSION, true );
 			wp_enqueue_script( 'visualizer-media-controller', VISUALIZER_ABSURL . 'js/media/controller.js', array( 'visualizer-media-collection' ), Visualizer_Plugin::VERSION, true );
 			wp_enqueue_script( 'visualizer-media-view', VISUALIZER_ABSURL . 'js/media/view.js', array( 'visualizer-media-controller' ), Visualizer_Plugin::VERSION, true );
+			wp_localize_script(
+				'visualizer-media-view', 'visualizer', array(
+					'i10n' => array(
+						'insert'    => __( 'Insert', 'visualizer' ),
+					),
+				)
+			);
 			wp_enqueue_script( 'visualizer-media-toolbar', VISUALIZER_ABSURL . 'js/media/toolbar.js', array( 'visualizer-media-view' ), Visualizer_Plugin::VERSION, true );
 			wp_enqueue_script( 'visualizer-media', VISUALIZER_ABSURL . 'js/media.js', array( 'visualizer-media-toolbar' ), Visualizer_Plugin::VERSION, true );
 		}

classes/Visualizer/Module/Frontend.php

@@ -54,6 +54,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		parent::__construct( $plugin );
 
 		$this->_addAction( 'wp_enqueue_scripts', 'enqueueScripts' );
+		$this->_addFilter( 'visualizer_get_language', 'getLanguage' );
 		$this->_addShortcode( 'visualizer', 'renderChart' );
 
 		// add do_shortocde hook for widget_text filter
@@ -69,6 +70,14 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		add_action( 'rest_api_init', array( $this, 'endpoint_register' ) );
 	}
 
+	/**
+	 * Returns the language/locale.
+	 */
+	function getLanguage( $dummy, $only_language ) {
+		return $this->get_language();
+	}
+
+
 	/**
 	 * Registers the endpoints
 	 */
@@ -150,7 +159,6 @@ public function enqueueScripts() {
 		wp_register_script( 'visualizer-google-jsapi-old', '//www.google.com/jsapi', array( 'visualizer-google-jsapi-new' ), null, true );
 		wp_register_script( 'visualizer-render', VISUALIZER_ABSURL . 'js/render.js', array( 'visualizer-google-jsapi-old', 'jquery' ), Visualizer_Plugin::VERSION, true );
 		wp_register_script( 'visualizer-clipboardjs', VISUALIZER_ABSURL . 'js/lib/clipboardjs/clipboard.min.js', array( 'jquery' ), Visualizer_Plugin::VERSION, true );
-		wp_enqueue_script( 'visualizer-clipboardjs' );
 		wp_register_style( 'visualizer-front', VISUALIZER_ABSURL . 'css/front.css', array(), Visualizer_Plugin::VERSION );
 		do_action( 'visualizer_pro_frontend_load_resources' );
 	}
@@ -268,6 +276,7 @@ public function renderChart( $atts ) {
 				if ( 'copy' === $key ) {
 					$copy           = $this->_getDataAs( $atts['id'], 'csv' );
 					$actions_div    .= ' data-clipboard-text="' . esc_attr( $copy['csv'] ) . '"';
+					wp_enqueue_script( 'visualizer-clipboardjs' );
 				}
 
 				$actions_div    .= apply_filters( 'visualizer_action_attributes', '', $key, $atts['id'] );

classes/Visualizer/Plugin.php

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

classes/Visualizer/Render/Templates.php

@@ -64,10 +64,7 @@ private function _renderTemplate( $id, $callback ) {
 	 * @access protected
 	 */
 	protected function _renderLibraryChart() {
-		echo '<div class="visualizer-library-chart-footer visualizer-clearfix">';
-			echo '<a class="visualizer-library-chart-action visualizer-library-chart-delete" href="javascript:;" title="', esc_attr__( 'Delete', 'visualizer' ), '"></a>';
-			echo '<a class="visualizer-library-chart-action visualizer-library-chart-insert" href="javascript:;" title="', esc_attr__( 'Insert', 'visualizer' ), '"></a>';
-
+		echo '<div class="visualizer-library-chart-footer visualizer-clearfix visualizer-library-media-popup">';
 			echo '<span class="visualizer-library-chart-shortcode" title="', esc_attr__( 'Click to select', 'visualizer' ), '">&nbsp;[visualizer id=&quot;{{data.id}}&quot;]&nbsp;</span>';
 		echo '</div>';
 	}

css/media.css

@@ -1,5 +1,5 @@
 /*
-	Version: 3.0.6
+	Version: 3.0.7
 */
 #visualizer-library-view {
 	padding: 30px 10px 10px 30px;
@@ -171,4 +171,35 @@ i.mce-i-visualizer-icon:before {
     -webkit-font-smoothing: antialiased;
     font: 400 20px/1 dashicons;
     vertical-align: top;
+}
+
+.visualizer-chart-bg, .visualizer-chart-insert-bg {
+	display: none;
+}
+
+.visualizer-library-chart:hover .visualizer-chart-bg {
+	display: block;
+	position: absolute;
+    background: #000000;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    opacity: 0.3;
+}
+
+.visualizer-library-chart:hover .visualizer-chart-bg ~ .visualizer-chart-insert-bg {
+	display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99999;
+}
+
+button.visualizer-library-chart-insert{
+    position: absolute;
+    top: 45%;
+    left: 45%;
 }

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.6
+	Version: 3.0.7
 	Author: Themeisle
 	Author URI: http://themeisle.com
 	License: GPL v2.0 or later

js/media/view.js

@@ -2,7 +2,7 @@
 /* global google */
 /* global visualizer */
 /* global showNotice */
-(function($, wpm) {
+(function($, wpm, visualizer) {
 	var libraryWidth, libraryHeight, wpmv, wpmV, wpmvv, wpmvvl, wpmvvb, l10n;
 
 	wpmv = wpm.view;
@@ -269,6 +269,18 @@
 						}
 
 						self.renderCollection();
+                        $('.visualizer-library-chart').css('position', 'relative')
+                            .append($(
+                                // jshint ignore:start
+                                '<div class="visualizer-chart-bg"></div>'
+                                + '<div class="visualizer-chart-insert-bg">'
+                                + '<button class="button button-primary visualizer-library-chart-insert">' + visualizer.i10n.insert + '</button>'
+                                + '</div>'
+                                // jshint ignore:end
+                            ))
+                            .on('mouseover', function(){
+                                $(this).addClass('hover');
+                            });
 						content.unlock();
 					}
 				}
@@ -464,7 +476,7 @@
 			this.controller.trigger('visualizer:library:page', $(e.target).data('page'));
 		}
 	});
-})(jQuery, wp.media);
+})(jQuery, wp.media, visualizer);
 
 (function($) {
     $.fn.lock = function() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "visualizer",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Visualizer Lite",
   "repository": {
     "type": "git",

readme.md

@@ -144,6 +144,14 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 5. Charts library
 
 ## Changelog ##
+### 3.0.7 - 2018-03-26  ###
+
+* Adds insert button in chart library.
+* Remove frontend assets where they are not needed.
+* Improve non-English charts compatibility. 
+* Adds a filter to change charts locale.
+
+
 ### 3.0.6 - 2018-02-27  ###
 
 * Fix UTF-8 support while saving the data.