From: Anthony Minessale II <anthony.minessale@gmail.com>
Date: Mon, 30 Nov 2015 18:50:56 +0000 (-0600)
Subject: Merge pull request #614 in FS/freeswitch from ~JAONZE/freeswitch:bugfix/FS-7800-add... 
X-Git-Tag: v1.6.6~1^2~77^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9383ecc1f05f3eeaccf05564864e45aacae4898b;p=thirdparty%2Ffreeswitch.git

Merge pull request #614 in FS/freeswitch from ~JAONZE/freeswitch:bugfix/FS-7800-add-support-for-fs-7769-feature-set to master

* commit '05ff8ec711d35c9817ef409e0ad2d55b76e898d7':
  FS-7800 [verto_communicator] - Added Canvas controls and now opening popup with original (master)  dimensions
  FS-7800 [verto_communicator] - Added an option in user's hover buttons to open another canvas when canvasCount is higher than 1
---

9383ecc1f05f3eeaccf05564864e45aacae4898b
diff --cc html5/verto/verto_communicator/src/vertoService/services/vertoService.js
index 4a46b09066,480ccb13ac..3b2c01758a
--- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
+++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js
@@@ -933,13 -919,16 +940,22 @@@ vertoService.service('verto', ['$rootSc
        sendConferenceChat: function(message) {
          data.conf.sendChat(message, "message");
        },
+       setCanvasIn: function(memberID, canvasID) {
+         data.conf.modCommand('vid-canvas', memberID, canvasID);
+       },
+       setCanvasOut: function(memberID, canvasID) {
+         data.conf.modCommand('vid-watching-canvas', memberID, canvasID);
+       },
+       setLayer: function(memberID, canvasID) {
+         data.conf.modCommand('vid-layer', memberID, canvasID);
+       },
        /*
 +      * Method is used to set a member's resevartion Id.
 +      */
 +      setResevartionId: function(memberID, resID) {
 +        data.conf.modCommand('vid-res-id', memberID, resID);
 +      },
 +      /*
        * Method is used to send user2user chats.
        * VC does not yet support that.
        */