Repository: openmeetings Updated Branches: refs/heads/master 7a592e77f -> 613083228
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index aad4161..076e863 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -325,6 +325,14 @@ var VideoManager = (function() { }); }); } + function _micActivity(uid, active) { + var u = $('#user' + uid + ' .audio-activity.ui-icon'); + if (active) { + u.addClass("speaking"); + } else { + u.removeClass("speaking"); + } + } self.getOptions = function() { return JSON.parse(JSON.stringify(options)); }; self.init = _init; @@ -332,6 +340,7 @@ var VideoManager = (function() { self.play = _play; self.close = _close; self.securityMode = function(uid, on) { $('#' + VideoUtil.getVid(uid)).data().securityMode(on); }; + self.micActivity = _micActivity; return self; })(); function setRoomSizes() { @@ -444,14 +453,6 @@ function sipKeyUp(evt) { } /***** functions required by SWF ******/ -function audioActivity(uid, active) { - var u = $('#user' + uid + ' .audio-activity.ui-icon'); - if (active) { - u.addClass("speaking"); - } else { - u.removeClass("speaking"); - } -} function typingActivity(uid, active) { var u = $('#user' + uid + ' .typing-activity.ui-icon'); if (active) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/61308322/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0c84d60..08fee99 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ <site.basedir>${project.basedir}</site.basedir> <src.pack.skip>false</src.pack.skip> <derby.version>10.13.1.1</derby.version> + <license.excludedScopes>test</license.excludedScopes> <db_user></db_user> <db_pass></db_pass> </properties> @@ -207,9 +208,6 @@ <goal>aggregate-add-third-party</goal> </goals> <configuration> - <properties> - <license.excludedScopes>test</license.excludedScopes> - </properties> <outputDirectory>${project.build.directory}</outputDirectory> <useMissingFile>true</useMissingFile> <licenseMerges>
