FS-8200 [verto_communicator] Ending screenshare if user hangup call. Screenshare...

diff --git a/html5/verto/verto_communicator/src/partials/video_call.html b/html5/verto/verto_communicator/src/partials/video_call.html
index 8c5ec45e7fd0ba890ae4a4104e8451257488fde6..da339e4878b9508185b4958f67bca48a45f3cfd3 100644 (file)
--- a/html5/verto/verto_communicator/src/partials/video_call.html
+++ b/html5/verto/verto_communicator/src/partials/video_call.html
@@ -17,9 +17,6 @@
       <button tooltips="" tooltip-title="Snapshot" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="snapshot()">
         <i class="mdi-image-photo-camera"></i>
       </button>
-      <button tooltips="" tooltip-title="Screenshare" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="screenshare()">
-        <i class="mdi-hardware-desktop-windows"></i>
-      </button>
       <div class="btn-group">
         <button tooltips="" tooltip-title="Video Mode" tooltip-side="bottom" tooltip-lazy="false" type="button" class="btn btn-material-blue-900 dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <i class="mdi-action-view-module"></i>
@@ -42,6 +39,9 @@
       <button tooltips="" tooltip-title="Toggle Fullscreen Mode" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="goFullscreen()">
         <i class="" ng-class="{'mdi-navigation-fullscreen': !fullscreenEnabled, 'mdi-navigation-fullscreen-exit': fullscreenEnabled}"></i>
       </button>
+      <button tooltips="" tooltip-title="Screenshare" tooltip-side="bottom" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="screenshare()">
+        <i class="mdi-hardware-desktop-windows"></i>
+      </button>
       <button tooltips="" tooltip-title="Open/Close Chat" tooltip-side="right" tooltip-lazy="false" class="btn btn-material-blue-900" ng-click="toggleChat()" ng-show="fullscreenEnabled">
         <i class="mdi-communication-chat"></i>
       </button>

diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
index 10de084ee0ceae90582f639b631581b3221567d8..0363d91f27551eeec94ee2e631649bdbc7baed48 100644 (file)
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
@@ -391,7 +391,9 @@
         //};
         //
         //verto.hangup(hangupCallback);
-
+        if (verto.data.shareCall) {
+          verto.screenshareHangup();
+        }
         verto.hangup();
       };