Skip to content

Commit 2e5dd69

Browse files
vytisbulkeviciusvytisbulkevicius
authored
release: fixes
- Updated dependencies - Change copy shortcode icon to clone a chart We can change copy Short Code icon #945 - Fix temp file creation issue on instawp selecting the line chart is not working on instawp #940 - Fix control Type error - Fixed simple editor scrolling issue - Fix filter broken layout - Fix chartJs javascript error when rendering multiple charts
2 parents 39af88c + dbae93f commit 2e5dd69

File tree

19 files changed

+114
-46
lines changed

19 files changed

+114
-46
lines changed

‎classes/Visualizer/Gutenberg/Block.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function enqueue_gutenberg_scripts() {
105105

106106
$translation_array = array(
107107
'isPro' => $type,
108-
'proTeaser' => Visualizer_Plugin::PRO_TEASER_URL,
108+
'proTeaser' => tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'blockupsell'),
109109
'absurl' => VISUALIZER_ABSURL,
110110
'charts' => Visualizer_Module_Admin::_getChartTypesLocalized(),
111111
'adminPage' => menu_page_url( 'visualizer', false ),

‎classes/Visualizer/Module.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ private function _getCSV( $rows, $filename, $enclose ) {
270270

271271
$bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
272272
$fp = tmpfile();
273+
if ( null === $fp ) {
274+
$fp = fopen( wp_tempnam(), 'w+' );
275+
}
273276
if ( ! apply_filters( 'vizualizer_export_include_series_type', true ) ) {
274277
unset( $rows[1] );
275278
$rows = array_values( $rows );
@@ -624,7 +627,7 @@ protected function get_inline_custom_css( $id, $settings ) {
624627
}
625628

626629
$img_path = VISUALIZER_ABSURL . 'images';
627-
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}";
630+
$css .= ".locker,.locker-loader{position:absolute;top:0;left:0;width:100%;height:100%}.locker{z-index:1000;opacity:.8;background-color:#fff;-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)\";filter:alpha(opacity=80)}.locker-loader{z-index:1001;background:url($img_path/ajax-loader.gif) no-repeat center center}.dt-button{display:none!important}.visualizer-front-container.visualizer-lazy-render{content-visibility: auto;}.google-visualization-controls-categoryfilter label.google-visualization-controls-label {vertical-align: middle;}.google-visualization-controls-categoryfilter li.goog-inline-block {margin: 0 0.2em;}.google-visualization-controls-categoryfilter li {padding: 0 0.2em;}";
628631
$css .= '</style>';
629632

630633
$arguments = array( $css, $settings );

‎classes/Visualizer/Module/Admin.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ public function handleGetProSubMenu() {
726726
jQuery( document ).ready( function() {
727727
jQuery( '#toplevel_page_visualizer' ).on( 'click', 'li:not(.wp-submenu-head, .wp-first-item):eq(2)', function( e ) {
728728
e.preventDefault();
729-
window.open( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing', '_blank' );
729+
window.open( '<?php echo tsdk_utmify( 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/', 'toplevel' ); ?>', '_blank' );
730730
} );
731731
} );
732732
</script>
@@ -968,6 +968,13 @@ public function renderLibraryPage() {
968968
$settings = $arguments[1];
969969
}
970970

971+
if ( isset( $settings['controls']['ui']['labelStacking'] ) ) {
972+
unset( $settings['controls']['ui']['labelStacking'] );
973+
}
974+
if ( isset( $settings['controls']['ui']['orientation'] ) ) {
975+
unset( $settings['controls']['ui']['orientation'] );
976+
}
977+
971978
// add chart to the array
972979
$charts[ $id ] = array(
973980
'id' => $chart->ID,
@@ -1086,7 +1093,7 @@ public function getPluginMetaLinks( $plugin_meta, $plugin_file ) {
10861093
);
10871094
// flattr link
10881095
$plugin_meta[] = sprintf(
1089-
'<a style="color:red" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" target="_blank">%s</a>',
1096+
'<a style="color:red" href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'pluginrow' ) . '" target="_blank">%s</a>',
10901097
esc_html__( 'Pro Addon', 'visualizer' )
10911098
);
10921099
}

‎classes/Visualizer/Module/Sources.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function addProUpsell( $old, $feature = null ) {
146146
$return .= ' <div class="only-pro-container">';
147147
$return .= ' <div class="only-pro-inner">';
148148
$return .= ' <p>' . $msg . '</p>';
149-
$return .= ' <a target="_blank" href="' . Visualizer_Plugin::PRO_TEASER_URL . '" title="' . __( 'Buy now', 'visualizer' ) . '">' . __( 'Buy now', 'visualizer' ) . '</a>';
149+
$return .= ' <a target="_blank" href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, esc_attr( $feature ) ) . '" title="' . __( 'Buy now', 'visualizer' ) . '">' . __( 'Buy now', 'visualizer' ) . '</a>';
150150
$return .= ' </div>';
151151
$return .= ' </div>';
152152
$return .= '</div>';

‎classes/Visualizer/Plugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class Visualizer_Plugin {
9898
const CF_CHART_URL = 'visualizer-chart-url';
9999
const CF_CHART_SCHEDULE = 'visualizer-chart-schedule';
100100
// Added by Ash/Upwork
101-
const PRO_TEASER_URL = 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/#pricing';
101+
const PRO_TEASER_URL = 'https://themeisle.com/plugins/visualizer-charts-and-graphs/upgrade/';
102102
const PRO_TEASER_TITLE = 'Check PRO version ';
103103

104104
const CF_CHART_CACHE = 'visualizer-chart-cache';

‎classes/Visualizer/Render/Library.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ private function _renderChartBox( $placeholder_id, $chart_id, $with_filter = fal
363363
if ( $this->can_chart_have_action( 'image', $chart_id ) ) {
364364
echo '<a class="visualizer-chart-action visualizer-chart-image" href="javascript:;" title="', esc_attr__( 'Download as image', 'visualizer' ), '" data-chart="visualizer-', $chart_id, '" data-chart-title="', $title, '"></a>';
365365
}
366-
echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" title="', esc_attr__( 'Click to copy shortcode', 'visualizer' ), '" data-clipboard-text="', esc_attr( $shortcode ), '"></a>';
366+
echo '<a class="visualizer-chart-action visualizer-chart-shortcode" href="javascript:;" title="', esc_attr__( 'Click to copy shortcode', 'visualizer' ), '" data-clipboard-text="', esc_attr( $shortcode ), '"><span class="dashicons dashicons-admin-page"></span></a>';
367367
echo '<span>&nbsp;</span>';
368368
echo '<hr><div class="visualizer-chart-status"><span title="' . __( 'Chart ID', 'visualizer' ) . '">(' . $chart_id . '):</span> <span class="visualizer-date" title="' . __( 'Last Updated', 'visualizer' ) . '">' . $chart_status['date'] . '</span><span class="visualizer-error"><i class="dashicons ' . $chart_status['icon'] . '" data-viz-error="' . esc_attr( str_replace( '"', "'", $chart_status['error'] ) ) . '" title="' . esc_attr( $chart_status['title'] ) . '"></i></span></div>';
369369
echo '</div>';
@@ -397,7 +397,7 @@ private function _renderSidebar() {
397397
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Frontend editor', 'visualizer' ) . '</li>';
398398
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Private charts', 'visualizer' ) . '</li>';
399399
echo '<li><svg class="icon list-icon"><use xlink:href="#list-icon"></use></svg>' . __( 'Auto-sync with online files', 'visualizer' ) . '</li></ul>';
400-
echo '<p><a href="' . str_replace( '#pricing', '#features', Visualizer_Plugin::PRO_TEASER_URL ) . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
400+
echo '<p><a href="' . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'sidebarupsell' ) . '" target="_blank" class="button button-primary">' . __( 'View more features', 'visualizer' ) . '</a></p>';
401401
echo '</div>';
402402
echo '</div>';
403403
echo '</div>';

‎classes/Visualizer/Render/Page/Types.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function _renderContent() {
6161
}
6262
echo '<div class="type-box type-box-', $type, $lib_classes, '">';
6363
if ( ! $array['enabled'] ) {
64-
echo "<a class='pro-upsell' href='" . Visualizer_Plugin::PRO_TEASER_URL . "' target='_blank'>";
64+
echo "<a class='pro-upsell' href='" . tsdk_utmify( Visualizer_Plugin::PRO_TEASER_URL, 'charttypes' ) . "' target='_blank'>";
6565
echo "<span class='visualizder-pro-label'>" . __( 'PREMIUM', 'visualizer' ) . '</span>';
6666
}
6767
echo '<label class="type-label', $type === $this->type ? ' type-label-selected' : '', '">';

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
}
4848
},
4949
"require-dev": {
50-
"wp-coding-standards/wpcs": "1.2.1",
50+
"wp-coding-standards/wpcs": "^2.3",
5151
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
5252
"phpcompatibility/phpcompatibility-wp": "*"
5353
}

‎composer.lock

Lines changed: 24 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/frame.css

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,23 @@
1919
}
2020
#control_wrapper_canvas:not(:empty) {
2121
margin: 15px 0 0 5px;
22+
position: relative;
23+
z-index: 1;
24+
}
25+
#control_wrapper_canvas:not(:empty) + #canvas .google-visualization-table {
26+
top: 60px;
2227
}
23-
#control_wrapper_canvas:not(:empty) + #canvas {
24-
top: 55px;
25-
left: 50px;
28+
.vz-vertical .google-visualization-table {
29+
left: 70px;
30+
}
31+
.google-visualization-controls-categoryfilter label.google-visualization-controls-label {
32+
vertical-align: middle;
33+
}
34+
.google-visualization-controls-categoryfilter li.goog-inline-block {
35+
margin: 0 0.2em;
36+
}
37+
.google-visualization-controls-categoryfilter li {
38+
padding: 0 0.2em;
2639
}
2740
.goog-combobox input {
2841
min-height: auto;
@@ -1526,6 +1539,10 @@ button#viz-text-editor-button {
15261539
vertical-align: middle;
15271540
}
15281541

1542+
.viz-simple-editor .viz-html-table {
1543+
width: 95%;
1544+
}
1545+
15291546
/******************************************************************************/
15301547
/******************************** chartjs ***********************************/
15311548
/******************************************************************************/

0 commit comments

Comments
 (0)