Skip to content

Commit 45f8947

Browse files
Fix filter layout issue Codeinwp/visualizer-pro#348
1 parent 622e2cf commit 45f8947

File tree

4 files changed

+35
-4
lines changed

4 files changed

+35
-4
lines changed

classes/Visualizer/Module.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ protected function get_inline_custom_css( $id, $settings ) {
624624
}
625625

626626
$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;}";
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;}.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;}";
628628
$css .= '</style>';
629629

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

classes/Visualizer/Module/Admin.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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,

css/frame.css

Lines changed: 16 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;
27+
}
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;
2236
}
23-
#control_wrapper_canvas:not(:empty) + #canvas {
24-
top: 55px;
25-
left: 50px;
37+
.google-visualization-controls-categoryfilter li {
38+
padding: 0 0.2em;
2639
}
2740
.goog-combobox input {
2841
min-height: auto;

js/render-google.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ var chartWrapperError = [];
399399
});
400400

401401
if ( withControlMode ) {
402+
// alert( chart.is_library_page );
402403
// Create a control wrapper, passing some options.
403404
var controlWrapper = new gv.ControlWrapper( {
404405
containerId: 'control_wrapper_' + id,
@@ -410,6 +411,16 @@ var chartWrapperError = [];
410411
render.setOptions(settings);
411412
chartWrapper.bind(controlWrapper, render);
412413
chartWrapper.draw(table);
414+
415+
gv.events.addListener(controlWrapper, 'ready', function ( err ) {
416+
if ( 'vertical' === settings.controls.ui.orientation ) {
417+
if ( 'canvas' === id ) {
418+
jQuery( '#' + id ).addClass( 'vz-vertical' );
419+
}
420+
} else {
421+
jQuery( '#' + id ).removeClass( 'vz-vertical' );
422+
}
423+
});
413424
} else {
414425
$('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
415426
render.draw(table, settings);

0 commit comments

Comments
 (0)