]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #614 in FS/freeswitch from ~JAONZE/freeswitch:bugfix/FS-7800-add...
authorAnthony Minessale II <anthony.minessale@gmail.com>
Mon, 30 Nov 2015 18:50:56 +0000 (12:50 -0600)
committerAnthony Minessale II <anthony.minessale@gmail.com>
Mon, 30 Nov 2015 18:50:56 +0000 (12:50 -0600)
* 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

1  2 
html5/verto/verto_communicator/src/css/verto.css
html5/verto/verto_communicator/src/partials/chat.html
html5/verto/verto_communicator/src/partials/video_call.html
html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
html5/verto/verto_communicator/src/vertoControllers/controllers/InCallController.js
html5/verto/verto_communicator/src/vertoService/services/vertoService.js

index 4a46b09066540cc4ecd42ed159202e7719124245,480ccb13ac91044b26d761a988ffc63649cdc6af..3b2c01758a95a18b6303bd69dbbf6e9023e3e876
@@@ -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.
        */