From 320cf0adb837a8860c09c717b29c666ccb9a3c5b Mon Sep 17 00:00:00 2001 From: Jaon EarlWolf Date: Thu, 29 Oct 2015 15:15:27 -0300 Subject: [PATCH] Target link for the plugin url, added comment explaining override $.FSRTC callback --- html5/verto/verto_communicator/src/css/verto.css | 5 +++++ .../src/vertoControllers/controllers/InCallController.js | 9 +++++---- .../src/vertoService/services/vertoService.js | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/html5/verto/verto_communicator/src/css/verto.css b/html5/verto/verto_communicator/src/css/verto.css index d307eecdaf..9d75a32037 100644 --- a/html5/verto/verto_communicator/src/css/verto.css +++ b/html5/verto/verto_communicator/src/css/verto.css @@ -8,6 +8,11 @@ body { padding-top: 60px; } +.install { + color: white; + text-decoration: underline; +} + .ellipsis { text-overflow: ellipsis; overflow: hidden; diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js index b3a1870963..7f8d7b0765 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js @@ -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 install 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'); } }); diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 71b823fb29..6f0366740b 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -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();