Don't show MOH popover if the button isn't displayed

master
Daniel Berteaud 10 years ago
parent dcbc616b01
commit 83356a2248
  1. 6
      public/js/vroom.js
  2. 2
      templates/default/join.html.ep

@ -1562,6 +1562,12 @@ function initVroom(room) {
setTimeout(function(){ setTimeout(function(){
$('#connecting').modal('hide'); $('#connecting').modal('hide');
}, 200); }, 200);
// Show MOH poup if the button is visible
if ($('.btn-moh:fist').css('display') !== 'none'){
$('.btn-moh').popover({
trigger: 'focus'
});
}
} }
}); });
checkMoh(); checkMoh();

@ -73,7 +73,7 @@
</button> </button>
</div> </div>
<div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs aloneEl"> <div class="btn-group navbar-form navbar-btn-group navbar-left hidden-xs aloneEl">
<button class="btn btn-lg btn-default popup btn-moh" data-toggle="popover" data-content="<%=l 'WAIT_WITH_MUSIC' %>" data-placement="bottom"> <button class="btn btn-lg btn-default btn-moh" data-toggle="popover" data-content="<%=l 'WAIT_WITH_MUSIC' %>" data-placement="bottom">
<span class="glyphicon glyphicon-music"> <span class="glyphicon glyphicon-music">
</span> </span>
</button> </button>

Loading…
Cancel
Save