Repository: openmeetings Updated Branches: refs/heads/4.0.x 50d631830 -> 3511369f1
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3511369f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js index e764929..09e2453 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js @@ -17,7 +17,7 @@ var Player = (function() { })); } - player.create = function(canvas, _o, _role) { + player.create = function(canvas, _o, wb) { const vid = $('<video>').hide().attr('class', 'wb-video slide-' + canvas.slide).attr('id', 'wb-video-' + _o.uid) .attr("width", _o.width).attr("height", _o.height) .append($('<source>').attr('type', 'video/mp4').attr('src', _o._src)); @@ -206,7 +206,7 @@ var Player = (function() { fabric.util.requestAnimFrame(render); } } - group.setPlayable(_role); + group.setPlayable(wb.getRole()); canvas.add(group); canvas.renderAll(); player.modify(group, _o); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3511369f/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index a9590ca..9bc70fb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -633,7 +633,7 @@ var Wb = function() { APointer().create(canvases[o.slide], o); break; case 'video': - Player.create(canvases[o.slide], o, role); + Player.create(canvases[o.slide], o, wb); break; default: { @@ -712,7 +712,10 @@ var Wb = function() { for (let i = 0; i < canvases.length; ++i) { func(canvases[i]); } - } + }; wb.videoStatus = _videoStatus; + wb.getRole = function() { + return role; + }; return wb; };
