]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Target link for the plugin url, added comment explaining override $.FSRTC callback
authorJaon EarlWolf <jamonsterr@gmail.com>
Thu, 29 Oct 2015 18:15:27 +0000 (15:15 -0300)
committerJaon EarlWolf <jamonsterr@gmail.com>
Thu, 29 Oct 2015 18:15:27 +0000 (15:15 -0300)
html5/verto/verto_communicator/src/css/verto.css
html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
html5/verto/verto_communicator/src/vertoService/services/vertoService.js

index d307eecdafdffe9240929ffc74f58d17b9f7e350..9d75a3203790bfbd025ad8a696b9fe5a398780b5 100644 (file)
@@ -8,6 +8,11 @@ body {
   padding-top: 60px;
 }
 
+.install {
+  color: white;
+  text-decoration: underline;
+}
+
 .ellipsis {
   text-overflow: ellipsis;
   overflow: hidden;
index b3a1870963476f8193ac3f7b00a9a7660bc784d5..7f8d7b07651ddae044bfa84afcc4fadce20f3544 100644 (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.');
         $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');
           }
         });
 
index 71b823fb298dea8b5b968b28010b8b802cfba058..6f0366740bf06704ed47a58a9e17f0f2e9df8da1 100644 (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();