kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Target link for the plugin url, added comment explaining override $.FSRTC callback

This commit is contained in:
Jaon EarlWolf 2015-10-29 15:15:27 -03:00
parent 43cb965f7e
commit 320cf0adb8
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,11 @@ body {
padding-top: 60px;
}
.install {
color: white;
text-decoration: underline;
}
.ellipsis {
text-overflow: ellipsis;
overflow: hidden;

9
html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
View File

@ -5,7 +5,7 @@
.module('vertoControllers')
.controller('InCallController', ['$rootScope', '$scope',
'$http', '$location', '$modal', '$timeout', 'toastr', 'verto', 'storage', 'prompt', 'Fullscreen',
function($rootScope, $scope, $http, $location, $modal, $timeout, toatr,
function($rootScope, $scope, $http, $location, $modal, $timeout, toastr,
verto, storage, prompt, Fullscreen) {
console.debug('Executing InCallController.');
@ -87,16 +87,17 @@
$scope.muteMic = verto.muteMic;
$scope.muteVideo = verto.muteVideo;
$scope.$on('ScreenShareExtensionStatus', function(error) {
$rootScope.$on('ScreenShareExtensionStatus', function(event, error) {
var pluginUrl = 'https://chrome.google.com/webstore/detail/screen-capturing/ajhifddimkapgcifgcodmmfdlknahffk';
switch(error) {
case 'permission-denied':
toastr.info('Please allow the plugin in order to use Screen Share', 'Error'); break;
case 'not-installed':
toastr.warning('Please install the plugin in order to use Screen Share', 'Warning'); break;
toastr.warning('Please <a target="_blank" class="install" href="'+ pluginUrl +'">install</a> the plugin in order to use Screen Share', 'Warning', { allowHtml: true }); break;
case 'installed-disabled':
toastr.info('Please enable the plugin in order to use Screen Share', 'Error'); break;
// case 'not-chrome'
// toastr.info('Please allow the plugin in order to use Screen Share', 'Error');
// toastr.info('Chrome', 'Error');
}
});

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

@ -704,7 +704,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}
});
// Override onStream callback in $.FSRTC instance
call.rtc.options.callbacks.onStream = function(rtc, stream) {
if(stream) {
var StreamTrack = stream.getVideoTracks()[0];
@ -712,8 +712,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
// (stream.getVideoTracks()[0]).onended = stopSharing;
}
console.log("stream started");
console.log("screenshare started");
function stopSharing() {
if(that.data.shareCall) {
that.screenshareHangup();