diff --git a/web/app/assets/javascripts/configureTracksHelper.js b/web/app/assets/javascripts/configureTracksHelper.js index 3e42fb7c1..90a3fb510 100644 --- a/web/app/assets/javascripts/configureTracksHelper.js +++ b/web/app/assets/javascripts/configureTracksHelper.js @@ -71,13 +71,24 @@ $channel.data('cloned', hoverChannel); hoverChannel - .hover(function(e) {}, function() { removeHoverer($(this)); }) + .hover(function(e) { + var hoverCheckTimeout = hoverChannel.data('hoverCheckTimeout'); + if(hoverCheckTimeout) { + clearTimeout(hoverCheckTimeout); + hoverChannel.data('hoverCheckTimeout', null); + } + }, function() { removeHoverer($(this)); }) .mousedown(function(e) { // because we have obscured the element the user wants to drag, // we proxy a mousedown on the hover-element to the covered .ftue-input ($channel). // this causes jquery.drag to get going even though the user clicked a different element $channel.trigger(e) }) + hoverChannel.data('hoverCheckTimeout', setTimeout(function() { + // check if element has already been left + hoverChannel.data('hoverCheckTimeout', null); + removeHoverer(hoverChannel); + }, 500)); hoverChannel.prependTo($offsetParent); } diff --git a/web/app/assets/javascripts/networkTest.js b/web/app/assets/javascripts/networkTestHelper.js similarity index 100% rename from web/app/assets/javascripts/networkTest.js rename to web/app/assets/javascripts/networkTestHelper.js diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 171a99639..70f3e9725 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -75,7 +75,6 @@ "PeerMediaTrackGroup": 10 }; - function beforeShow(data) { sessionId = data.id; promptLeave = true; @@ -817,6 +816,8 @@ ], usedMixers); if (mixer) { + var participant = (sessionModel.getParticipant(clientId) || {name:'unknown'}).name; + logger.debug("found mixer=" + mixer.id + ", participant=" + participant) usedMixers[mixer.id] = true; keysToDelete.push(key); var gainPercent = percentFromMixerValue( @@ -839,6 +840,8 @@ $('.disabled-track-overlay', $track).show(); $('.track-connection', $track).removeClass('red yellow green').addClass('red'); } + var participant = (sessionModel.getParticipant(clientId) || {name:'unknown'}).name; + logger.debug("still looking for mixer=" + mixer.id + ", participant=" + participant) } }