Skip to content

Commit c5cc94f

Browse files
Merge branch 'development' of https://github.com/codeinwp/visualizer into issue-251
2 parents f19a555 + 056b3c4 commit c5cc94f

File tree

4 files changed

+53
-1
lines changed

4 files changed

+53
-1
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class Visualizer_Render_Sidebar_Type_Gauge extends Visualizer_Render_Sidebar {
3939
*/
4040
protected function _toHTML() {
4141
$this->_supportsAnimation = false;
42+
$this->_renderGeneralSettings();
4243
$this->_renderGaugeSettings();
4344
$this->_renderViewSettings();
4445
$this->_renderAdvancedSettings();
@@ -60,6 +61,21 @@ protected function _renderGaugeSettings() {
6061
self::_renderGroupEnd();
6162
}
6263

64+
protected function _renderGeneralSettings() {
65+
self::_renderGroupStart( esc_html__( 'General Settings', 'visualizer' ) );
66+
67+
self::_renderSectionStart( esc_html__( 'Title', 'visualizer' ), false );
68+
self::_renderTextItem(
69+
esc_html__( 'Chart Title', 'visualizer' ),
70+
'title',
71+
$this->title,
72+
esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
73+
);
74+
self::_renderSectionEnd();
75+
76+
self::_renderSectionStart( esc_html__( 'Gauge Settings', 'visualizer' ), false );
77+
}
78+
6379
/**
6480
* Renders tick settings group.
6581
*

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class Visualizer_Render_Sidebar_Type_Geo extends Visualizer_Render_Sidebar {
3939
*/
4040
protected function _toHTML() {
4141
$this->_supportsAnimation = false;
42+
$this->_renderGeneralSettings();
4243
$this->_renderMapSettings();
4344
$this->_renderColorAxisSettings();
4445
$this->_renderSizeAxisSettings();
@@ -47,6 +48,26 @@ protected function _toHTML() {
4748
$this->_renderAdvancedSettings();
4849
}
4950

51+
/**
52+
* Renders general settings group.
53+
*
54+
* @since 1.0.0
55+
*
56+
* @access protected
57+
*/
58+
protected function _renderGeneralSettings() {
59+
self::_renderGroupStart( esc_html__( 'General Settings', 'visualizer' ) );
60+
self::_renderSectionStart( esc_html__( 'Title', 'visualizer' ), false );
61+
self::_renderTextItem(
62+
esc_html__( 'Chart Title', 'visualizer' ),
63+
'title',
64+
$this->title,
65+
esc_html__( 'Text to display in the back-end admin area.', 'visualizer' )
66+
);
67+
self::_renderSectionEnd();
68+
self::_renderGroupEnd();
69+
}
70+
5071
/**
5172
* Renders map settings group.
5273
*

index.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ function visualizer_launch() {
8888
if ( is_admin() || defined( 'WP_TESTS_DOMAIN' ) ) {
8989
// set admin modules
9090
$plugin->setModule( Visualizer_Module_Admin::NAME );
91-
} else {
91+
}
92+
93+
if ( ! is_admin() || defined( 'WP_TESTS_DOMAIN' ) ) {
9294
// set frontend modules
9395
$plugin->setModule( Visualizer_Module_Frontend::NAME );
9496
}

js/render.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
/* global google */
22
/* global visualizer */
33
/* global console */
4+
5+
// this will store the images for each chart rendered.
6+
var __visualizer_chart_images = [];
7+
48
(function(v, g) {
59
var gv;
610

@@ -207,6 +211,15 @@
207211

208212
v.override(settings);
209213

214+
g.visualization.events.addListener(render, 'ready', function () {
215+
var arr = id.split('-');
216+
try{
217+
__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = render.getImageURI();
218+
}catch(error){
219+
console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
220+
}
221+
});
222+
210223
render.draw(table, settings);
211224
};
212225

0 commit comments

Comments
 (0)