kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

FS-8545 #resolve [Improve controls for screen share]

Browse Source
This commit is contained in:
Anthony Minessale
2015-11-16 15:54:43 -06:00
parent 67491b102c
commit 9f1c89b8e3
8 changed files with 72 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
html5/verto/verto_communicator/src/css/verto.css
View File

@@ -918,7 +918,6 @@ body .modal-body .btn-group .btn.active {
.members-badges {
font-size: 10px;
text-transform: uppercase;
margin-top: -2px;
}

3
html5/verto/verto_communicator/src/partials/chat.html
View File

@@ -28,7 +28,8 @@
<div class="members-badges">
<div ng-if="member.status.video.floor" class="label badge-floor" ng-class="{'label-danger': member.status.video.floorLocked, 'label-info': !member.status.video.floorLocked}"><i class="mdi mdi-action-https lock-floor" ng-if="member.status.video.floorLocked"></i> <span>Floor</span></div>
<div ng-if="member.status.video.reservationID == 'presenter'" class="label label-warning">Presenter</div>
<div ng-if="member.status.video.reservationID == 'presenter'" class="label label-info">Presenter</div>
<div ng-if="member.status.video.screenShare" class="label label-info">Screen Share</div>
</div>
</h4>

8
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@@ -471,9 +471,11 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
if (params.pvtData) {
switch (params.pvtData.action) {
case "conference-liveArray-join":
console.log("conference-liveArray-join");
stopConference();
startConference(v, dialog, params.pvtData);
if (!params.pvtData.secondScreen && !params.pvtData.screenShare && !params.pvtData.videoOnly) {
console.log("conference-liveArray-join");
stopConference();
startConference(v, dialog, params.pvtData);
}
break;
case "conference-liveArray-part":
console.log("conference-liveArray-part");