Browse Source

Fixes focus indicator tooltip showing when we're not focus.

master
yanas 11 years ago
parent
commit
c32ad97c0a
2 changed files with 7 additions and 5 deletions
  1. 2
    2
      index.html
  2. 5
    3
      videolayout.js

+ 2
- 2
index.html View File

39
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
39
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
40
     <script src="rtp_stats.js?v=1"></script><!-- RTP stats processing -->
40
     <script src="rtp_stats.js?v=1"></script><!-- RTP stats processing -->
41
     <script src="local_stats.js?v=1"></script><!-- Local stats processing -->
41
     <script src="local_stats.js?v=1"></script><!-- Local stats processing -->
42
-    <script src="videolayout.js?v=5"></script><!-- video ui -->
42
+    <script src="videolayout.js?v=6"></script><!-- video ui -->
43
     <script src="toolbar.js?v=3"></script><!-- toolbar ui -->
43
     <script src="toolbar.js?v=3"></script><!-- toolbar ui -->
44
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
44
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
45
     <link rel="stylesheet" href="css/font.css"/>
45
     <link rel="stylesheet" href="css/font.css"/>
123
                     <!--<video id="localVideo" autoplay oncontextmenu="return false;" muted></video> - is now per stream generated -->
123
                     <!--<video id="localVideo" autoplay oncontextmenu="return false;" muted></video> - is now per stream generated -->
124
                 </span>
124
                 </span>
125
                 <audio id="localAudio" autoplay oncontextmenu="return false;" muted></audio>
125
                 <audio id="localAudio" autoplay oncontextmenu="return false;" muted></audio>
126
-                <span class="focusindicator" data-content="The owner of&#10;this conference" data-toggle="popover" data-placement="top"></span>
126
+                <span class="focusindicator"></span>
127
             </span>
127
             </span>
128
             <audio id="userJoined" src="sounds/joined.wav" preload="auto"></audio>
128
             <audio id="userJoined" src="sounds/joined.wav" preload="auto"></audio>
129
             <audio id="userLeft" src="sounds/left.wav" preload="auto"></audio>
129
             <audio id="userLeft" src="sounds/left.wav" preload="auto"></audio>

+ 5
- 3
videolayout.js View File

477
             if (!indicatorSpan || indicatorSpan.length === 0) {
477
             if (!indicatorSpan || indicatorSpan.length === 0) {
478
                 indicatorSpan = document.createElement('span');
478
                 indicatorSpan = document.createElement('span');
479
                 indicatorSpan.className = 'focusindicator';
479
                 indicatorSpan.className = 'focusindicator';
480
-                Util.setTooltip(indicatorSpan,
481
-                                "The owner of<br/>this conference",
482
-                                "top");
480
+
483
                 focusContainer.appendChild(indicatorSpan);
481
                 focusContainer.appendChild(indicatorSpan);
484
 
482
 
485
                 createFocusIndicatorElement(indicatorSpan);
483
                 createFocusIndicatorElement(indicatorSpan);
772
         var focusIndicator = document.createElement('i');
770
         var focusIndicator = document.createElement('i');
773
         focusIndicator.className = 'fa fa-star';
771
         focusIndicator.className = 'fa fa-star';
774
         parentElement.appendChild(focusIndicator);
772
         parentElement.appendChild(focusIndicator);
773
+
774
+        Util.setTooltip(parentElement,
775
+                "The owner of<br/>this conference",
776
+                "top");
775
     }
777
     }
776
 
778
 
777
     /**
779
     /**

Loading…
Cancel
Save