From 83356a22483b74039e209014cc66e4630490564b Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 24 Feb 2015 22:23:05 +0100
Subject: [PATCH] Don't show MOH popover if the button isn't displayed

---
 public/js/vroom.js             | 6 ++++++
 templates/default/join.html.ep | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/public/js/vroom.js b/public/js/vroom.js
index f658670..c911d2d 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -1562,6 +1562,12 @@ function initVroom(room) {
         setTimeout(function(){
           $('#connecting').modal('hide');
         }, 200);
+        // Show MOH poup if the button is visible
+        if ($('.btn-moh:fist').css('display') !== 'none'){
+          $('.btn-moh').popover({
+            trigger: 'focus'
+          });
+        }
       }
     });
     checkMoh();
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index adb9ae6..76f1d84 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -73,7 +73,7 @@
           </button>
         </div>
         <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>
           </button>