Remove the MOH popover

I just find it anoying
master
Daniel Berteaud 10 years ago
parent b8f6f7313f
commit 71867c0f0d
  1. 19
      public/js/vroom.js
  2. 2
      templates/default/join.html.ep

@ -1145,21 +1145,10 @@ function initVroom(room) {
function checkMoh(){ function checkMoh(){
setTimeout(function(){ setTimeout(function(){
if (countPeers() < 1){ if (countPeers() < 1){
if ($('.btn-moh:first').hasClass('btn-danger')){ if ($('.btn-moh').first().hasClass('btn-danger')){
$('#mohPlayer').get(0).volume = .25; $('#mohPlayer').get(0).volume = .25;
$('#mohPlayer').get(0).play(); $('#mohPlayer').get(0).play();
} }
else{
$('.btn-moh').on('hidden.bs.popover', function(){
$('.btn-moh').popover('destroy');
});
setTimeout(function(){
$('.btn-moh').popover('show');
}, 200);
setTimeout(function(){
$('.btn-moh').popover('hide');
}, 5000);
}
$('.aloneEl').show(200); $('.aloneEl').show(200);
} }
}, 3000); }, 3000);
@ -1562,12 +1551,6 @@ 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 btn-moh" data-toggle="popover" data-content="<%=l 'WAIT_WITH_MUSIC' %>" data-placement="bottom"> <button class="btn btn-lg btn-default btn-moh help" data-toggle="tooltip" data-placement="bottom" title="<%=l 'WAIT_WITH_MUSIC' %>">
<span class="glyphicon glyphicon-music"> <span class="glyphicon glyphicon-music">
</span> </span>
</button> </button>

Loading…
Cancel
Save