Fix file conflict #859

Author: girishpanchal30

classes/Visualizer/Gutenberg/build/block.js

@@ -63,7 +63,7 @@ class SeriesSettings extends Component {
                         let indexToFormat = parseInt( i );
                         let label = series[i].label || '';
                         let type = series[i].type || '';
-
+                        let timer = 0;
                         if ( 'tabular' !== type ) {
                             indexToFormat = index;
                         }
@@ -105,6 +105,15 @@ class SeriesSettings extends Component {
 												settings.series[index].lineWidth = e;
 												this.props.edit( settings );
 											} }
+											onKeyUp={ e => {
+												clearTimeout( timer );
+												timer = setTimeout( () => {
+													if ( '' != settings.series[index].lineWidth && 0 >= settings.series[index].lineWidth ) {
+														settings.series[index].lineWidth = '0.1';
+														this.props.edit( settings );
+													}
+												}, 700 );
+											} }
 										/>
 
 										<TextControl

classes/Visualizer/Gutenberg/src/Components/Sidebar/SeriesSettings.js

@@ -257,7 +257,7 @@ protected function _renderSeries( $index ) {
 				echo '<tr>';
 					echo '<td class="viz-section-table-column">';
 						$line_width = isset( $this->series[ $index ]['lineWidth'] ) ? $this->series[ $index ]['lineWidth'] : '';
-						echo '<input type="text" name="series[', $index, '][lineWidth]" class="control-text" value="', esc_attr( $line_width ), '" placeholder="2">';
+						echo '<input type="text" name="series[', $index, '][lineWidth]" class="control-text series-linewidth" value="', esc_attr( $line_width ), '" placeholder="2">';
 					echo '</td>';
 					echo '<td class="viz-section-table-column">';
 						$point_size = isset( $this->series[ $index ]['pointSize'] ) ? $this->series[ $index ]['pointSize'] : '';

classes/Visualizer/Render/Sidebar/Linear.php

@@ -556,4 +556,14 @@ var __visualizer_chart_images   = [];
         }
     });
 
+    var timer = 0;
+    $( document ).on( 'input', '.series-linewidth', function() {
+        var seriesLineWidth = $( this );
+        clearTimeout( timer );
+        timer = setTimeout( function() {
+            if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) {
+                seriesLineWidth.val( '0.1' );
+            }
+        }, 700 );
+    } );
 })(jQuery);