From 42b58a97e82e104ade546a117f3272551d01f1e8 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 15 Apr 2015 15:14:41 -0500 Subject: [PATCH] * VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule --- web/app/assets/javascripts/session.js | 3 ++- web/app/assets/stylesheets/client/session.css.scss | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index dfa76dc65..a2d27efe8 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -172,6 +172,7 @@ function afterShow(data) { + $fluidTracks.addClass('showing'); $openBackingTrack.removeClass('disabled'); if(!context.JK.JamServer.connected) { @@ -500,7 +501,7 @@ } function beforeHide(data) { - + $fluidTracks.removeClass('showing'); if(screenActive) { // this path is possible if FTUE is invoked on session page, and they cancel sessionModel.leaveCurrentSession() diff --git a/web/app/assets/stylesheets/client/session.css.scss b/web/app/assets/stylesheets/client/session.css.scss index 94228e6f0..fbf72fc30 100644 --- a/web/app/assets/stylesheets/client/session.css.scss +++ b/web/app/assets/stylesheets/client/session.css.scss @@ -258,10 +258,13 @@ } .session-fluidtracks { - width:calc(100% - #{$mytracks-minwidth}); position:relative; float:left; @include border_box_sizing; + + &.showing { + width:calc(100% - #{$mytracks-minwidth}); // VRFS-3034 + } } .session-livetracks {