@@ -259,57 +259,57 @@ function sceneUpdate(gd, subplot) {
259259 // draw traces in proper order
260260 scene . draw = function draw ( ) {
261261 var i ;
262- var we_must_draw_previous_line_marker = 0 ;
262+ var we_must_draw_previous_line_marker = 0 ;
263263 for ( i = 0 ; i < scene . count ; i ++ ) {
264- var we_defer_somes_draw = 0 ;
265- if ( scene . fill2d && scene . fillOptions [ i ] && scene . fillOptions [ i ] . fillmode == " tonext" ) {
266- we_defer_somes_draw = 1 ;
267- } else {
268- if ( we_must_draw_previous_line_marker && scene . line2d && scene . lineOptions [ i - 1 ] ) {
269- scene . line2d . draw ( i - 1 ) ;
270- }
271- if ( we_must_draw_previous_line_marker && scene . scatter2d && scene . markerOptions [ i - 1 ] ) {
272- scene . scatter2d . draw ( i - 1 ) ;
273- }
274- we_must_draw_previous_line_marker = 0 ;
275- }
264+ var we_defer_somes_draw = 0 ;
265+ if ( scene . fill2d && scene . fillOptions [ i ] && scene . fillOptions [ i ] . fillmode && scene . fillOptions [ i ] . fillmode === ' tonext' ) {
266+ we_defer_somes_draw = 1 ;
267+ } else {
268+ if ( we_must_draw_previous_line_marker && scene . line2d && scene . lineOptions [ i - 1 ] ) {
269+ scene . line2d . draw ( i - 1 ) ;
270+ }
271+ if ( we_must_draw_previous_line_marker && scene . scatter2d && scene . markerOptions [ i - 1 ] ) {
272+ scene . scatter2d . draw ( i - 1 ) ;
273+ }
274+ we_must_draw_previous_line_marker = 0 ;
275+ }
276276 if ( scene . fill2d && scene . fillOptions [ i ] ) {
277277 scene . fill2d . draw ( i ) ;
278278 }
279- // we draw line2d
280- if ( we_must_draw_previous_line_marker && scene . line2d && scene . lineOptions [ i - 1 ] ) {
281- scene . line2d . draw ( i - 1 ) ;
282- }
279+ // we draw line2d
280+ if ( we_must_draw_previous_line_marker && scene . line2d && scene . lineOptions [ i - 1 ] ) {
281+ scene . line2d . draw ( i - 1 ) ;
282+ }
283283 if ( scene . line2d && scene . lineOptions [ i ] ) {
284- if ( we_defer_somes_draw == 0 ) {
285- scene . line2d . draw ( i ) ;
286- }
284+ if ( we_defer_somes_draw === 0 ) {
285+ scene . line2d . draw ( i ) ;
286+ }
287287 }
288288 if ( scene . error2d && scene . errorXOptions [ i ] ) {
289289 scene . error2d . draw ( i ) ;
290290 }
291291 if ( scene . error2d && scene . errorYOptions [ i ] ) {
292292 scene . error2d . draw ( i + scene . count ) ;
293293 }
294- // we draw scatter2d
295- if ( ! scene . selectBatch || ! scene . selectBatch [ i ] ) {
296- if ( we_must_draw_previous_line_marker && scene . scatter2d && scene . markerOptions [ i - 1 ] ) {
297- scene . scatter2d . draw ( i - 1 ) ;
298- }
299- if ( scene . scatter2d && scene . markerOptions [ i ] ) {
300- if ( we_defer_somes_draw == 0 ) {
301- scene . scatter2d . draw ( i ) ;
302- }
303- }
304- }
294+ // we draw scatter2d
295+ if ( ! scene . selectBatch || ! scene . selectBatch [ i ] ) {
296+ if ( we_must_draw_previous_line_marker && scene . scatter2d && scene . markerOptions [ i - 1 ] ) {
297+ scene . scatter2d . draw ( i - 1 ) ;
298+ }
299+ if ( scene . scatter2d && scene . markerOptions [ i ] ) {
300+ if ( we_defer_somes_draw === 0 ) {
301+ scene . scatter2d . draw ( i ) ;
302+ }
303+ }
304+ }
305305 if ( scene . glText [ i ] && scene . textOptions [ i ] ) {
306306 scene . glText [ i ] . render ( ) ;
307307 }
308- if ( we_defer_somes_draw == 1 ) {
309- we_must_draw_previous_line_marker = 1 ;
310- } else {
311- we_must_draw_previous_line_marker = 0 ;
312- }
308+ if ( we_defer_somes_draw === 1 ) {
309+ we_must_draw_previous_line_marker = 1 ;
310+ } else {
311+ we_must_draw_previous_line_marker = 0 ;
312+ }
313313 }
314314
315315 // draw traces in selection mode
0 commit comments