| @@ -58,9 +58,9 @@ | ||
| 58 | 58 | $this->_library = 'google'; |
| 59 | 59 | parent::__construct( $data ); |
| 60 | 60 | |
| 61 | 61 | $this->_legendPositions = array( |
| 62 | - '' => esc_html__( 'Default', 'visualizer' ), | |
| 62 | + '' => '', | |
| 63 | 63 | 'left' => esc_html__( 'Left of the chart', 'visualizer' ), |
| 64 | 64 | 'right' => esc_html__( 'Right of the chart', 'visualizer' ), |
| 65 | 65 | 'top' => esc_html__( 'Above the chart', 'visualizer' ), |
| 66 | 66 | 'bottom' => esc_html__( 'Below the chart', 'visualizer' ), |
| @@ -81,8 +81,9 @@ | ||
| 81 | 81 | 'start' => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ), |
| 82 | 82 | 'center' => esc_html__( 'Centered in the allocated area', 'visualizer' ), |
| 83 | 83 | 'end' => esc_html__( 'Aligned to the end of the allocated area', 'visualizer' ), |
| 84 | 84 | ); |
| 85 | + | |
| 85 | 86 | } |
| 86 | 87 | |
| 87 | 88 | /** |
| 88 | 89 | * Registers additional hooks. |
| @@ -97,17 +98,15 @@ | ||
| 97 | 98 | |
| 98 | 99 | /** |
| 99 | 100 | * Loads the assets. |
| 100 | 101 | */ |
| 101 | - public function load_google_assets( $deps, $is_frontend ) { | |
| 102 | + function load_google_assets( $deps, $is_frontend ) { | |
| 102 | 103 | wp_register_script( 'google-jsapi', '//www.gstatic.com/charts/loader.js', array(), null, true ); |
| 103 | - wp_register_script( 'dom-to-image', VISUALIZER_ABSURL . 'js/lib/dom-to-image.min.js', array(), null, true ); | |
| 104 | 104 | wp_register_script( |
| 105 | 105 | 'visualizer-render-google-lib', |
| 106 | 106 | VISUALIZER_ABSURL . 'js/render-google.js', |
| 107 | 107 | array( |
| 108 | 108 | 'google-jsapi', |
| 109 | - 'dom-to-image', | |
| 110 | 109 | ), |
| 111 | 110 | Visualizer_Plugin::VERSION, |
| 112 | 111 | true |
| 113 | 112 | ); |
| @@ -115,8 +114,9 @@ | ||
| 115 | 114 | return array_merge( |
| 116 | 115 | $deps, |
| 117 | 116 | array( 'visualizer-render-google-lib' ) |
| 118 | 117 | ); |
| 118 | + | |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | 122 | * Enqueue assets. |
| @@ -147,18 +147,10 @@ | ||
| 147 | 147 | 'emphasis' => esc_html__( 'Emphasis', 'visualizer' ), |
| 148 | 148 | 'scope' => esc_html__( 'Scope', 'visualizer' ), |
| 149 | 149 | 'style' => esc_html__( 'Style', 'visualizer' ), |
| 150 | 150 | 'tooltip' => esc_html__( 'Tooltip', 'visualizer' ), |
| 151 | - 'interval' => esc_html__( 'Interval', 'visualizer' ), | |
| 152 | 151 | ), |
| 153 | - sprintf( | |
| 154 | - // translators: %1$s - HTML link tag, %2$s - HTML closing link tag, %3$s - HTML link tag, %4$s - HTML closing link tag | |
| 155 | - esc_html__( 'Determines whether the series has to be used for a special role as mentioned in %1$shere%2$s. You can view a few examples %3$shere%4$s.', 'visualizer' ), | |
| 156 | - '<a href="https://developers.google.com/chart/interactive/docs/roles#what-roles-are-available" target="_blank">', | |
| 157 | - '</a>', | |
| 158 | - '<a href="https://docs.themeisle.com/article/1160-roles-for-series-visualizer" target="_blank">', | |
| 159 | - '</a>' | |
| 160 | - ) | |
| 152 | + sprintf( esc_html__( 'Determines whether the series has to be used for a special role as mentioned in %1$shere%2$s. You can view a few examples %3$shere%4$s.', 'visualizer' ), '<a href="https://developers.google.com/chart/interactive/docs/roles#what-roles-are-available" target="_blank">', '</a>', '<a href="https://docs.themeisle.com/article/1160-roles-for-series-visualizer" target="_blank">', '</a>' ) | |
| 161 | 153 | ); |
| 162 | 154 | } |
| 163 | 155 | |
| 164 | 156 | /** |
| @@ -180,9 +172,9 @@ | ||
| 180 | 172 | |
| 181 | 173 | self::_renderSectionStart( esc_html__( 'Font Styles', 'visualizer' ), false ); |
| 182 | 174 | echo '<div class="viz-section-item">'; |
| 183 | 175 | echo '<a class="more-info" href="javascript:;">[?]</a>'; |
| 184 | - echo '<b>', esc_html__( 'Font Family And Size', 'visualizer' ), '</b>'; | |
| 176 | + echo '<b>', esc_html__( 'Family And Size', 'visualizer' ), '</b>'; | |
| 185 | 177 | |
| 186 | 178 | echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; |
| 187 | 179 | echo '<tr>'; |
| 188 | 180 | echo '<td class="viz-section-table-column">'; |
| @@ -215,17 +207,17 @@ | ||
| 215 | 207 | self::_renderSectionStart( esc_html__( 'Legend', 'visualizer' ), false ); |
| 216 | 208 | self::_renderSelectItem( |
| 217 | 209 | esc_html__( 'Position', 'visualizer' ), |
| 218 | 210 | 'legend[position]', |
| 219 | - isset( $this->legend['position'] ) ? $this->legend['position'] : '', | |
| 211 | + $this->legend['position'], | |
| 220 | 212 | $this->_legendPositions, |
| 221 | - esc_html__( 'Sets the legend position relative to the chart.', 'visualizer' ) | |
| 213 | + esc_html__( 'Determines where to place the legend, compared to the chart area.', 'visualizer' ) | |
| 222 | 214 | ); |
| 223 | 215 | |
| 224 | 216 | self::_renderSelectItem( |
| 225 | 217 | esc_html__( 'Alignment', 'visualizer' ), |
| 226 | 218 | 'legend[alignment]', |
| 227 | - isset( $this->legend['alignment'] ) ? $this->legend['alignment'] : '', | |
| 219 | + $this->legend['alignment'], | |
| 228 | 220 | $this->_alignments, |
| 229 | 221 | esc_html__( 'Determines the alignment of the legend.', 'visualizer' ) |
| 230 | 222 | ); |
| 231 | 223 | |
| @@ -241,25 +233,9 @@ | ||
| 241 | 233 | $this->_renderTooltipSettigns(); |
| 242 | 234 | self::_renderSectionEnd(); |
| 243 | 235 | |
| 244 | 236 | $this->_renderAnimationSettings(); |
| 245 | - self::_renderSectionStart( esc_html__( 'License & Creator', 'visualizer' ), false ); | |
| 246 | - self::_renderTextItem( | |
| 247 | - esc_html__( 'License', 'visualizer' ), | |
| 248 | - 'license', | |
| 249 | - $this->license, | |
| 250 | - '' | |
| 251 | - ); | |
| 252 | - self::_renderTextItem( | |
| 253 | - esc_html__( 'Creator', 'visualizer' ), | |
| 254 | - 'creator', | |
| 255 | - $this->creator, | |
| 256 | - '' | |
| 257 | - ); | |
| 258 | - self::_renderSectionEnd(); | |
| 259 | 237 | |
| 260 | - self::_renderChartImageSettings(); | |
| 261 | - | |
| 262 | 238 | do_action( 'visualizer_chart_settings', get_class( $this ), $this->_data, 'general', array( 'generic' => true ) ); |
| 263 | 239 | |
| 264 | 240 | self::_renderGroupEnd(); |
| 265 | 241 | } |
| @@ -306,8 +282,9 @@ | ||
| 306 | 282 | esc_html__( 'The easing function applied to the animation.', 'visualizer' ) |
| 307 | 283 | ); |
| 308 | 284 | |
| 309 | 285 | self::_renderSectionEnd(); |
| 286 | + | |
| 310 | 287 | } |
| 311 | 288 | |
| 312 | 289 | /** |
| 313 | 290 | * Renders tooltip settings section. |
| @@ -321,14 +298,14 @@ | ||
| 321 | 298 | esc_html__( 'Trigger', 'visualizer' ), |
| 322 | 299 | 'tooltip[trigger]', |
| 323 | 300 | isset( $this->tooltip['trigger'] ) ? $this->tooltip['trigger'] : null, |
| 324 | 301 | array( |
| 325 | - '' => esc_html__( 'Default', 'visualizer' ), | |
| 302 | + '' => '', | |
| 326 | 303 | 'focus' => esc_html__( 'The tooltip will be displayed when the user hovers over an element', 'visualizer' ), |
| 327 | - 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element.', 'visualizer' ), | |
| 304 | + 'selection' => esc_html__( 'The tooltip will be displayed when the user selects an element', 'visualizer' ), | |
| 328 | 305 | 'none' => esc_html__( 'The tooltip will not be displayed', 'visualizer' ), |
| 329 | 306 | ), |
| 330 | - esc_html__( 'Controls when the tooltip appears.', 'visualizer' ) | |
| 307 | + esc_html__( 'Determines the user interaction that causes the tooltip to be displayed.', 'visualizer' ) | |
| 331 | 308 | ); |
| 332 | 309 | |
| 333 | 310 | self::_renderSelectItem( |
| 334 | 311 | esc_html__( 'Show Color Code', 'visualizer' ), |
| @@ -372,9 +349,9 @@ | ||
| 372 | 349 | echo '</div>'; |
| 373 | 350 | |
| 374 | 351 | echo '<div class="viz-section-delimiter"></div>'; |
| 375 | 352 | |
| 376 | - self::_renderSectionDescription( esc_html__( 'Set the chart\'s background color, border width, and border color.', 'visualizer' ) ); | |
| 353 | + self::_renderSectionDescription( esc_html__( 'Configure the background color for the main area of the chart and the chart border width and color.', 'visualizer' ) ); | |
| 377 | 354 | |
| 378 | 355 | self::_renderTextItem( |
| 379 | 356 | esc_html__( 'Stroke Width', 'visualizer' ), |
| 380 | 357 | 'backgroundColor[strokeWidth]', |
| @@ -415,14 +392,12 @@ | ||
| 415 | 392 | |
| 416 | 393 | echo '<table class="viz-section-table" cellspacing="0" cellpadding="0" border="0">'; |
| 417 | 394 | echo '<tr>'; |
| 418 | 395 | echo '<td class="viz-section-table-column">'; |
| 419 | - $chartarea_left = isset( $this->chartArea['left'] ) ? $this->chartArea['left'] : ''; | |
| 420 | - echo '<input type="text" name="chartArea[left]" class="control-text" value="', $chartarea_left || '0' === $chartarea_left ? esc_attr( $chartarea_left ) : '', '" placeholder="20%">'; | |
| 396 | + 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%">'; | |
| 421 | 397 | echo '</td>'; |
| 422 | 398 | echo '<td class="viz-section-table-column">'; |
| 423 | - $chartarea_top = isset( $this->chartArea['top'] ) ? $this->chartArea['top'] : ''; | |
| 424 | - echo '<input type="text" name="chartArea[top]" class="control-text" value="', $chartarea_top || '0' === $chartarea_top ? esc_attr( $chartarea_top ) : '', '" placeholder="20%">'; | |
| 399 | + 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%">'; | |
| 425 | 400 | echo '</td>'; |
| 426 | 401 | echo '</tr>'; |
| 427 | 402 | echo '</table>'; |
| 428 | 403 | |
| @@ -446,29 +421,11 @@ | ||
| 446 | 421 | echo '</tr>'; |
| 447 | 422 | echo '</table>'; |
| 448 | 423 | |
| 449 | 424 | echo '<p class="viz-section-description">'; |
| 450 | - esc_html_e( 'Determines the width and height of the chart area.', 'visualizer' ); | |
| 425 | + esc_html_e( 'Determines the width and hight of the chart area.', 'visualizer' ); | |
| 451 | 426 | echo '</p>'; |
| 452 | 427 | echo '</div>'; |
| 453 | 428 | self::_renderSectionEnd(); |
| 454 | 429 | self::_renderGroupEnd(); |
| 455 | - } | |
| 456 | - | |
| 457 | - /** | |
| 458 | - * Renders advanced settings and hidden inputs for programmatically-set keys | |
| 459 | - * (e.g. the global-preset colors palette) that have no visible sidebar control. | |
| 460 | - * | |
| 461 | - * @access protected | |
| 462 | - */ | |
| 463 | - protected function _renderAdvancedSettings(): void { | |
| 464 | - parent::_renderAdvancedSettings(); | |
| 465 | - | |
| 466 | - // @phpstan-ignore-next-line (property accessed via magic __get from _data array) | |
| 467 | - $colors = $this->colors; | |
| 468 | - if ( ! empty( $colors ) && is_array( $colors ) ) { | |
| 469 | - foreach ( $colors as $color ) { | |
| 470 | - echo '<input type="hidden" name="colors[]" value="', esc_attr( $color ), '">'; | |
| 471 | - } | |
| 472 | - } | |
| 473 | 430 | } |
| 474 | 431 | } |