You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/14 13:46:53 UTC
svn commit: r1739063 [1/3] - in /openmeetings/application/branches/3.2.x: ./
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/
openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
openmeetings-core/src/main/j...
Author: solomax
Date: Thu Apr 14 11:46:52 2016
New Revision: 1739063
URL: http://svn.apache.org/viewvc?rev=1739063&view=rev
Log:
[OPENMEETINGS-895] initial commit with partial HTML5 room
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.html
- copied unchanged from r1739057, openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/InvitationDialog.java
- copied, changed from r1739057, openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
- copied, changed from r1739057, openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/message/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/message/RoomMessage.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Removed:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/EmoticonsManager.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ChatService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ContactService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/GroupService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/servlet/outputhandler/DownloadHandler.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/chat/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/conference/
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/applyForModeration.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/stringhandlers/ChatString.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/public/emoticons/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/public/themes/basic-theme/auth/
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/public/themes/basic-theme/conference/
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/web.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/activities.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/js/history.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/public/theme.xml
openmeetings/application/branches/3.2.x/pom.xml
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java Thu Apr 14 11:46:52 2016
@@ -201,8 +201,8 @@ public class MainService implements IPen
return allowed;
}
- public User loginWicket(String SID, String wicketSID, Long wicketroomid) {
- log.debug("[loginWicket] SID: '{}'; wicketSID: '{}'; wicketroomid: '{}'", SID, wicketSID, wicketroomid);
+ public User loginWicket(String wicketSID, Long wicketroomid) {
+ log.debug("[loginWicket] wicketSID: '{}'; wicketroomid: '{}'", wicketSID, wicketroomid);
Long userId = sessiondataDao.checkSession(wicketSID);
User u = userId == null ? null : userDao.get(userId);
if (u != null && wicketroomid != null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Thu Apr 14 11:46:52 2016
@@ -33,7 +33,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.openmeetings.core.data.conference.RoomManager;
-import org.apache.openmeetings.core.data.whiteboard.EmoticonsManager;
import org.apache.openmeetings.core.data.whiteboard.WhiteboardManager;
import org.apache.openmeetings.core.remote.RecordingService;
import org.apache.openmeetings.core.remote.WhiteBoardService;
@@ -84,8 +83,6 @@ public class ScopeApplicationAdapter ext
@Autowired
private ISessionManager sessionManager;
@Autowired
- private EmoticonsManager emoticonsManager;
- @Autowired
private WhiteBoardService whiteBoardService;
@Autowired
private WhiteboardManager whiteboardManagement;
@@ -130,11 +127,6 @@ public class ScopeApplicationAdapter ext
// init your handler here
- // The scheduled Jobs did go into the Spring-Managed Beans, see schedulerJobs.service.xml
-
- // Spring Definition does not work here, its too early, Instance is not set yet
- emoticonsManager.loadEmot();
-
for (String scopeName : scope.getScopeNames()) {
log.debug("scopeName :: " + scopeName);
}
@@ -163,6 +155,8 @@ public class ScopeApplicationAdapter ext
Map<String, Object> map = conn.getConnectParams();
String swfURL = map.containsKey("swfUrl") ? (String)map.get("swfUrl") : "";
+ String tcUrl = map.containsKey("tcUrl") ? (String)map.get("tcUrl") : "";
+ String uid = params != null && params.length > 0 ? (String)params[0] : "";
Client parentClient = null;
//TODO add similar code for other connections
@@ -173,9 +167,15 @@ public class ScopeApplicationAdapter ext
return rejectClient();
}
}
- Client rcm = sessionManager.addClientListItem(conn.getClient().getId(),
- conn.getScope().getName(), conn.getRemotePort(),
- conn.getRemoteAddress(), swfURL, null);
+ Client rcm = new Client();
+ rcm.setStreamid(conn.getClient().getId());
+ rcm.setScope(conn.getScope().getName());
+ rcm.setUserport(conn.getRemotePort());
+ rcm.setUserip(conn.getRemoteAddress());
+ rcm.setSwfurl(swfURL);
+ rcm.setTcUrl(tcUrl);
+ rcm.setPublicSID(uid);
+ rcm = sessionManager.add(rcm, null);
if (rcm == null) {
log.warn("Failed to create Client on room connect");
return false;
@@ -191,13 +191,13 @@ public class ScopeApplicationAdapter ext
SessionVariablesUtil.setIsScreenClient(conn.getClient());
rcm.setUserId(parentClient.getUserId());
- Long uid = rcm.getUserId();
- SessionVariablesUtil.setUserId(conn.getClient(), uid);
+ Long userId = rcm.getUserId();
+ SessionVariablesUtil.setUserId(conn.getClient(), userId);
rcm.setStreamPublishName(parentSid);
User u = null;
- if (uid != null) {
- long _uid = uid.longValue();
+ if (userId != null) {
+ long _uid = userId.longValue();
u = userDao.get(_uid < 0 ? -_uid : _uid);
}
if (u != null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java Thu Apr 14 11:46:52 2016
@@ -35,6 +35,7 @@ import org.apache.openmeetings.db.dto.ba
import org.apache.openmeetings.db.dto.server.ClientSessionInfo;
import org.apache.openmeetings.db.entity.room.Client;
import org.apache.openmeetings.db.entity.server.Server;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +75,28 @@ public class SessionManager implements I
}
@Override
+ public Client add(Client c, Server server) {
+ if (server == null) {
+ server = serverUtil.getCurrentServer();
+ }
+ c.setConnectedSince(new Date());
+ if (Strings.isEmpty(c.getPublicSID())) {
+ c.setPublicSID(UUID.randomUUID().toString());
+ }
+ c.setServer(server);
+ c.setIsMod(false);
+ c.setCanDraw(false);
+
+ if (cache.containsKey(null, c.getStreamid())) {
+ log.error("Tried to add an existing Client " + c.getStreamid());
+ return null;
+ }
+
+ cache.put(c.getStreamid(), c);
+ return c;
+ }
+
+ @Override
public Client addClientListItem(String streamId, String scopeName,
int remotePort, String remoteAddress, String swfUrl, Server server) {
if (server == null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/ISessionManager.java Thu Apr 14 11:46:52 2016
@@ -42,6 +42,7 @@ public interface ISessionManager {
*/
void sessionStart();
+ Client add(Client c, Server server);
/**
* add a new client item
*
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Thu Apr 14 11:46:52 2016
@@ -287,6 +287,9 @@ public class Client implements IDataProv
// FIXME: Move to {@link ClientSession}
@Column(name = "swfurl", length=2048)
private String swfurl;
+
+ @Column(name = "tcurl", length=2048)
+ private String tcUrl;
/**
* @see Client#getIsRecording()
@@ -863,6 +866,14 @@ public class Client implements IDataProv
this.mobile = mobile;
}
+ public String getTcUrl() {
+ return tcUrl;
+ }
+
+ public void setTcUrl(String tcUrl) {
+ this.tcUrl = tcUrl;
+ }
+
@Override
public String toString() {
return "Client [streamid=" + streamid + ", publicSID=" + publicSID + ", isScreenClient=" + screenClient
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Thu Apr 14 11:46:52 2016
@@ -144,19 +144,19 @@
<handler name="onconnect">
if($debug) Debug.write("hibRtmpConnection/onconnect");
if (this.reconnectionAction){
- if (canvas.wicketsid == null) {
- this.overwritePublicSID.doCall();
- this.setUsernameReconnect.doCall();
- } else {
+ if (!!canvas.wicketsid) {
canvas.sessionId = canvas.wicketsid;
- this.getPublicSID.doCall();
+ getDefaultLanguage.doCall();
+ } else {
+ this.overwritePublicSID.doCall(); //FIXME investigate
+ this.setUsernameReconnect.doCall();
}
- } else if (canvas.wicketsid != null) {
+ } else if (!!canvas.wicketsid) {
canvas.sessionId = canvas.wicketsid;
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- this.getPublicSID.doCall();
+ getDefaultLanguage.doCall();
} else {
this.refreshDelegate = new LzDelegate(this, "refreshSessionMeth");
lz.Timer.addTimer(this.refreshDelegate, canvas.refreshSession);
@@ -195,7 +195,6 @@
client.stopPublishingMessage = this.stopPublishingMessage;
client.newRed5ScreenCursor = this.newRed5ScreenCursor;
client.nickNameSet = this.nickNameSet;
- client.clearChatContent = this.clearChatContent;
client.startedPublishing = this.startedPublishing;
client.newPoll = this.newPoll;
</handler>
@@ -225,7 +224,6 @@
lz.ModeManager.releaseAll();
}
if ($debug) Debug.write("Error dialog is being closed, calling QUIT");
- canvas.commonVideoViewContent.immediateExitRoom(true,null);
}
});
this.showFullMessage = false;
@@ -615,7 +613,6 @@
</netRemoteCallHib>
<netRemoteCallHib name="loginWicket" funcname="xmlcrm.loginWicket" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
<netparam><method name="getValue">return canvas.wicketsid;</method></netparam>
<netparam><method name="getValue">return canvas.wicketroomid;</method></netparam>
<handler name="ondata" args="value">
@@ -798,10 +795,6 @@
if (value == null || value.screenClient) {
return;
}
- if (canvas.currentBaseConferenceRoom != null && canvas.currentBaseConferenceRoom._chatPanelStrict != null) {
- if ($debug) Debug.write("canvas.currentBaseConferenceRoom._chatPanelStrict: ", canvas.currentBaseConferenceRoom._chatPanelStrict);
- canvas.currentBaseConferenceRoom._chatPanelStrict.closeprivatechat(["close", value.publicSID]);
- }
if (canvas.currentActivityList != null) {
canvas.currentActivityList.addMessageRequest(value, canvas.getLabelName(1367), new Date().getTime());
}
@@ -827,13 +820,6 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="logicalRoomLeaveDis" funcname="logicalRoomLeaveDis" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("logicalRoomLeaveDis: ",value);
- parent.roomDisconnectUser(value, value.broadCastID);
- </handler>
- </netRemoteCallHib>
-
<method name="setUserStatus" args="ctx,user,o">
<![CDATA[
if (!o || !user) return;
@@ -1154,10 +1140,6 @@
} else if (value[0]=='typingActivity'){
if ($debug) Debug.write("!!!typingActivity ::", value[1], canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]));
canvas._videocontainer._participants.getUserListItemByPublicSID(value[2]).userTyping(value[1]);
- } else if (value[0]=='chat'){
- // Not Used
- //Debug.warn("Not Used");
- canvas.addChatHistory(value);
} else if (value[0]=='activateWhiteboard'){
// Not Used
//Debug.warn("Not Used");
@@ -1187,23 +1169,6 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="sendChatMessageWithClient"
- funcname="chatservice.sendMessageWithClient" remotecontext="$once{ canvas.thishib }">
- <attribute name="messageObj" value="null" />
- <netparam><method name="getValue">return parent.messageObj;</method></netparam>
-
- <method name="sendMessage" args="messageObject">
- this.messageObj = messageObject;
- this.doCall();
- </method>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageWithClient getValue : ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
<netRemoteCallHib name="sendMessageWithClient" funcname="sendMessageWithClient"
remotecontext="$once{ canvas.thishib }" >
@@ -1259,11 +1224,6 @@
}
} else if (value.message[0]=='applyModAnswer'){
canvas.currentModApply.setUserAnswer(value);
- } else if (value.message[0]=='privatechat'){
- if ($debug) Debug.write("privatechat",value.message,value.client);
- canvas._currentChatPanel.privatechat(value.message,value.client);
- } else if (value.message[0]=='chat'){
- if (canvas._chatcontent) canvas._chatcontent.addChatHistory(value.message,value.client);
} else if (value.message[0]=='avsettings'){
canvas.commonVideoViewContent.setAVSettingsToClient(value.client);
} else if (value.message[0]=='whiteboard'){
@@ -1359,13 +1319,7 @@
<method name="newMessageByRoomAndDomain" args="value">
<![CDATA[
- if (value[0]=='closeprivatechat'){
- if ($debug) Debug.write("closeprivatechat",value);
- canvas._currentChatPanel.closeprivatechat(value);
- } else if (value[0]=='newprivatechat'){
- if ($debug) Debug.write("newprivatechat",value);
- canvas._currentChatPanel.newprivatechat(value);
- } else if (value.message=='desktop'){
+ if (value.message=='desktop'){
canvas._drawarea.incomingScreenSharing(value);
} else if (value.message=='library'){
if (value.action == 'import') {
@@ -1507,13 +1461,6 @@
]]>
</method>
- <method name="clearChatContent" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- canvas._chatcontent.reload();
- ]]>
- </method>
-
<netRemoteCallHib name="setCanGiveAudio" funcname="whiteboardservice.setCanGiveAudio"
remotecontext="$once{ canvas.thishib }">
<attribute name="publicSID" value="" type="string" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Thu Apr 14 11:46:52 2016
@@ -33,104 +33,6 @@
</when>
</switch>
- <class name="baseconfmenucommand" extends="command" >
- <attribute name="enabled" value="true" type="boolean" />
- <attribute name="tipLabelId" value="0" type="number" />
- </class>
-
- <class name="confmenucommand" extends="baseconfmenucommand" >
- <attribute name="actionCommand" value="" type="string" />
- <handler name="onselect" args="sel">
- if (!this.enabled) {
- return;
- }
- canvas.doActionmenu(this.actionCommand);
- </handler>
- </class>
-
- <baseconfmenucommand id="cmd_shareDesktop" tipLabelId="1480" >
- <handler name="onselect" args="sel">
- if (!this.enabled) {
- return;
- }
- canvas._mymod.checkForApplyScreen("no");
- </handler>
- </baseconfmenucommand>
-
- <confmenucommand id="cmd_applyforMod" tipLabelId="1481" actionCommand="applyForMod" />
-
- <confmenucommand id="cmd_applyforWhiteBoard" tipLabelId="1492" key="['control','shift','2']">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforWhiteBoard onselect",tSel);
- //Ask for Right to Draw on Whiteboard
- var tDate = new Date();
- canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
- </handler>
- </confmenucommand>
-
- <baseconfmenucommand id="cmd_applyforA" tipLabelId="1602">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforA onselect",canvas.ismoderator,tSel);
- if (canvas.ismoderator) {
- //Do directly send confirmation to share Audio/Video to SELF! so that all users get
- //the notification and the broadcasting Bit is set for this User
- canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
- canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
- canvas.thishib.setBroadCastingFlag.canVideo = false;
- canvas.thishib.setBroadCastingFlag.doCall();
- } else {
- //Apply for Right to Share Audio/Video
- var tDate = new Date();
- canvas.thishib.sendMessageWithClient.sendMessage("applyForA",tDate.getTime());
- }
- </handler>
- </baseconfmenucommand>
- <baseconfmenucommand id="cmd_applyforAV" tipLabelId="1482">
- <handler name="onselect" args="tSel">
- if (!this.enabled) {
- return;
- }
- if ($debug) Debug.write("cmd_applyforAV onselect",canvas.ismoderator,tSel);
- if (canvas.ismoderator) {
- //Do directly send confirmation to share Audio/Video to SELF! so that all users get
- //the notification and the broadcasting Bit is set for this User
- canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
- canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
- canvas.thishib.setBroadCastingFlag.canVideo = true;
- canvas.thishib.setBroadCastingFlag.doCall();
- } else {
- //Apply for Right to Share Audio/Video
- var tDate = new Date();
- canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",tDate.getTime());
- }
- </handler>
- </baseconfmenucommand>
-
- <confmenucommand id="cmd_createPoll" tipLabelId="1483" actionCommand="createPoll" />
- <confmenucommand id="cmd_pollResults" tipLabelId="1484" actionCommand="pollResults" />
- <confmenucommand id="cmd_checkPollVoted" tipLabelId="1485" actionCommand="checkPollVoted" />
- <confmenucommand id="cmd_importFile" tipLabelId="1479" actionCommand="importFile" />
- <confmenucommand id="cmd_editCamMicSettings" actionCommand="editCamMicSettings" tipLabelId="1486" />
- <confmenucommand id="cmd_quit" actionCommand="quit" tipLabelId="1487" />
- <confmenucommand id="cmd_showSipDialer" actionCommand="showSipDialer" tipLabelId="1488" />
-
- <confmenucommand id="cmd_invitation" actionCommand="invitation" tipLabelId="1489" />
- <confmenucommand id="cmd_editWhiteboardDefault" actionCommand="editWhiteboardDefault" tipLabelId="1490" />
-
- <confmenucommand id="cmd_exportFilePNG" onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileJPG" onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileSVG" onselect="canvas.doWhiteboardActionmenu('exportFileSVG')" tipLabelId="1489" />
- <!--
- <confmenucommand id="cmd_exportFilePDF" onselect="canvas.doWhiteboardActionmenu('exportFilePDF')" tipLabelId="1489" />
- <confmenucommand id="cmd_exportFileTIF" onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" tipLabelId="1489" />
- -->
-
<attribute name="colorArray" value="null" />
<attribute name="errorLoader" />
@@ -300,6 +202,10 @@
if (wicketsid != undefined) {
canvas.setAttribute('wicketsid', wicketsid);
}
+ var uid = lz.Browser.getInitArg('uid');
+ if (!!uid) {
+ canvas.setAttribute('publicSID', uid);
+ }
this.setBaseColors();
//Debug.write("rtmphostlocal,rtmphost: ",canvas.rtmphostlocal,canvas.rtmphost);
@@ -312,17 +218,6 @@
]]>
</method>
- <netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave" remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("############# logicalRoomLeave: ",value);
- canvas.commonVideoViewContent.closeAllScreenSharings();
- if (canvas.appointmentNotificationPopUp != null) {
- canvas.appointmentNotificationPopUp.destroy();
- }
- canvas.doActionmenu('quit');
- </handler>
- </netRemoteCallHib>
-
<method name="getLabelName" args="id">
//if($debug) Debug.write("main.lzx/getLabelName()",id);
return getLabelTag(id);
@@ -357,51 +252,6 @@
ExternalInterface.call("roomExit");
</method>
- <!---
- Actions connected to the shortcuts
- -->
- <method name="doActionmenu" args="stringSub">
- <![CDATA[
- if($debug) Debug.write("doActionmenu: ",stringSub);
- if (canvas._conferencemenu.visible) {
- switch (stringSub) {
- case "invitation":
- ExternalInterface.call("openInvitation");
- break;
- case 'editWhiteboardDefault':
- new lz.editWhiteboardDefault(canvas.main_content._content.inner);
- break;
- case 'createPoll':
- ExternalInterface.call("createPoll", canvas.publicSID);
- break;
- case 'pollResults':
- ExternalInterface.call("pollResults", canvas.publicSID);
- break;
- case 'checkPollVoted':
- ExternalInterface.call("vote", canvas.publicSID);
- break;
- case 'importFile':
- new lz.uploadWindowExplorer(canvas.main_content._content.inner, {x: 60});
- break;
- case 'applyForMod':
- if ($debug) Debug.info("Apply For Mod through doActionmenu");
- //new lz.applyForModeration(canvas.main_content._content.inner);
- canvas.thishib.applyForModeration.doCall();
- break;
- case 'editCamMicSettings':
- canvas.commonVideoViewContent.changeDevice();
- break;
- case 'showSipDialer':
- new lz.sipDialer(canvas.main_content._content.inner);
- break;
- case 'quit':
- canvas.quit();
- break;
- }
- }
- ]]>
- </method>
-
<method name="setRoomValues" args="roomObj">
if ($debug) Debug.warn("setRoomValues ",roomObj);
//this is needed cause in the rpc-method *getCurrentModeratorList* we check if its room.type == 'restricted'
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/base/remote/rtmpConnection.lzx Thu Apr 14 11:46:52 2016
@@ -52,7 +52,7 @@
this._nc.proxyType = canvas.proxyType;
- var ok = this._nc.connect(src == "null" ? null : src, false);
+ var ok = this._nc.connect(src == "null" ? null : src, canvas.publicSID);
if (this.debug) {
if($debug) Debug.write("*** debug ***");
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Thu Apr 14 11:46:52 2016
@@ -427,38 +427,6 @@
]]>
</method>
- <!---
- Shows the exit dialog
- -->
- <method name="exitRoom">
- if ($debug) Debug.write("exitRoom");
- new lz.confirmationSingle(canvas,{
- refObj:this,
- labelid:791,
- labeliderror:790,
- refReturnMethod:'immediateExitRoom',
- showCheckBox:false
- });
- return;
- </method>
-
- <method name="immediateExitRoom" args="bool,ctx">
- <![CDATA[
- if($debug) Debug.write("0", bool,ctx);
- if (bool) {
- if (canvas.wicketsid != null) {
- if($debug) Debug.write("1");
- clearAll();
- }
- if (canvas.thishib.connected) {
- canvas.logicalRoomLeave.doCall();
- } else {
- canvas.doActionmenu('quit');
- }
- }
- ]]>
- </method>
-
<method name="updateFirstLastName" args="publicSID,first,last">
var v = getVideoObjectByPublicSID(publicSID);
if (v != null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Thu Apr 14 11:46:52 2016
@@ -79,32 +79,9 @@
new lz.labelerrorPopup(canvas, {labelid: 1316, errorlabelid: 1315});
}
- if (this._chatPanelStrict) {
- var chatHidden = this.roomobj.chatHidden;
- this._chatPanelStrict.setAttribute('visible', !chatHidden);
- if (chatHidden) {
- this._chatPanelStrict.setAttribute('height', 28);
- }
- }
-
canvas.currentBaseConferenceRoom = this;
- if (!this.roomobj.hideTopBar) {
- canvas.main_content.setAttribute('y', 28);
- canvas.currentBaseConferenceRoom.createMenu();
- }
- canvas._conferencemenu.setAttribute('visible', !this.roomobj.hideTopBar);
if ($debug) Debug.write("this.roomobj ",this.roomobj);
-
- if (!!canvas._mymod) {
- canvas._mymod.destroy();
- canvas._mymod = null;
- }
- new lz.moderationPanel(canvas._moderatormenu, {
- name:'_moderationPanel', align:'right',
- allowUserQuestions:this.roomobj.allowUserQuestions,
- roomName:this.roomobj.name
- });
if (roomobj.appointment) {
canvas.appointmentNotificationPopUp = new lz.appointmentNotificationPopUp(this,{name:'appDetail', roomobj:this.roomobj });
} else {
@@ -143,74 +120,6 @@
}
]]>
</handler>
-
- <baseTabChatPanel name="_chatPanelStrict" labelid="616"
- height="200" x="${ parent._sidePanel.width }"
- y="${ canvas.height - (this.height) - ((canvas.currentRoomObj.hideTopBar) ? 0 : 28) }"
- width="${ canvas.width - parent._sidePanel.width }" isopen="${ !canvas.currentRoomObj.chatOpened }" />
- <!-- isopen need to be reverted, will be toggled -->
-
- <handler name="ontabcontentleave">
- if ($debug) Debug.write("################# ontabcontentleave:",this);
-
- canvas.commonVideoViewContent.closeAllScreenSharings();
-
- canvas.currentBaseConferenceRoom = null;
-
- //reset the right to draw on WHiteboard as the RoomClient Object will be destroyed also
- //on server-Side the canDraw status will be false again when you relogin the same room
- canvas.isAllowedToDraw = true;
-
- _mainScrollBar.setAttribute("visibility","visible");
-
- //reset rights
- canvas.isAllowedToGiveExclusiveAudio = false;
-
- canvas.commonVideoViewContent.resetAllValues();
- if (canvas._chatcontent!=null) {
- canvas._chatcontent = null;
- }
- if (canvas._mymod!=null) {
- canvas._mymod = null;
- }
-
- if (this.meetingTimer != null) {
- this.meetingTimer.close();
- }
-
- if (canvas._drawarea.letterObjectIsActive) {
- canvas._drawarea.currentletterObj.destroy();
- }
-
- if (canvas.currentFileExplorer != null) {
- canvas.currentFileExplorer = null;
- }
-
- if (canvas.currentActivityList != null) {
- canvas.currentActivityList = null;
- }
-
- //@deprecated we will not use old screen sharing implementation
- //canvas._screens.clearAllSessions();
- this.logicalRoomLeave.doCall();
- if ($debug) Debug.write("############ this.logicalRoomLeave ",this.logicalRoomLeave);
- </handler>
-
- <netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave" remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("############# logicalRoomLeave: ",value);
- //this.parent.destroy();
- canvas.thishib.reconnectedRoomInstance = this.parent;
-
- // Reconnect User to default Scope
- canvas.thishib.userScope = "hibernate";
- var src = hib.getUrl();
- canvas.thishib.setAttribute('src',src);
- canvas.thishib.disconnect();
- canvas._conferencemenu.removeAll();
- canvas._conferencemenu.setAttribute('visibility','hidden');
- </handler>
- </netRemoteCallHib>
</class>
</library>
\ No newline at end of file
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx Thu Apr 14 11:46:52 2016
@@ -21,16 +21,10 @@
<library>
<class name="flexibleConferenceRoom" extends="baseConferenceRoom">
- <method name="createMenu">
- if ($debug) Debug.write("flexibleConferenceRoom:: createMenu");
- new lz.conferenceMenubar(canvas._conferencemenu);
- </method>
-
<conferenceRoomSidebar name="_sidePanel" />
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28) + ((canvas.currentRoomObj.hideTopBar) ? 28:0)}" clip="true"
+ width="${canvas.width-parent._sidePanel.width}" height="${ canvas.height - 5 + 28 }" clip="true"
visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
<view name="_inn" width="${parent.width-10}">
<wrappinglayout axis="x" spacing="10"/>
@@ -41,8 +35,7 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) -
- ((parent._chatPanelStrict.visible) ? 28 : 6) + ((canvas.currentRoomObj.hideTopBar) ? 28:0)}" />
+ height="${ canvas.height - 6 + 28 }" />
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/interviewConferenceRoom.lzx Thu Apr 14 11:46:52 2016
@@ -21,10 +21,6 @@
<library>
<class name="interviewConferenceRoom" extends="baseConferenceRoom">
- <method name="createMenu">
- new lz.interviewConferenceMenubar(canvas._conferencemenu);
- </method>
-
<handler name="oninit">
canvas.currentRoomObj.hideScreenSharing = true;
</handler>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/library.lzx Thu Apr 14 11:46:52 2016
@@ -26,8 +26,6 @@
<frame src="resources/bullet_ball_glass_red.png"/> <!-- whiteboard allow -->
</resource>
- <resource name="chat_message_incoming_rsc" src="resources/ledlightgreen.png" />
-
<!-- FamFam Icon Set -->
<resource name="screen_allow_rsc" src="resources/monitor_add.png" />
<!-- FamFam Icon Set -->
@@ -45,8 +43,6 @@
<resource name="av_allow_rsc" src="resources/audio_and_video.png" />
<!-- FamFam Icon Set -->
<resource name="av_deny_rsc" src="resources/audio_and_video_no.png" />
- <!-- FamFam Icon Set -->
- <resource name="start_private_chat_rsc" src="resources/page_edit.png" />
<!-- APL author sebawagner -->
<resource name="kick_user_rsc" src="resources/cancel_icon.png" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx Thu Apr 14 11:46:52 2016
@@ -21,15 +21,10 @@
<library>
<class name="restrictedConferenceRoom" extends="baseConferenceRoom">
- <method name="createMenu">
- new lz.restrictedConferenceMenubar(canvas._conferencemenu);
- </method>
-
<restrictedRoomSidebar name="_sidePanel" listType="eventUserListTableWithNames" />
<view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width }"
- width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height) -
- (!parent._chatPanelStrict.visible ? 5 : 28)}" clip="true"
+ width="${canvas.width-parent._sidePanel.width}" height="${canvas.height- 5}" clip="true"
visible="${ !canvas.currentRoomObj.hideWhiteboard }">
<view name="_inn" width="${parent.width-10}">
<wrappinglayout axis="x" spacing="10"/>
@@ -40,7 +35,7 @@
<fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
y="0" x="${ parent._sidePanel.width }"
width="${ canvas.width - parent._sidePanel.width }"
- height="${ canvas.height - (parent._chatPanelStrict.height) - (!parent._chatPanelStrict.visible ? 0 : 28) }" />
+ height="${ canvas.height }" />
</class>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/roomSidebar/baseRoomSidebar.lzx Thu Apr 14 11:46:52 2016
@@ -21,7 +21,7 @@
<library>
<class name="baseRoomSidebar" extends="view" width="280" bgcolor="$once{ canvas.getThemeColor('mainBackgroundColor') }"
- height="${ canvas.height - ((canvas.currentRoomObj.hideTopBar) ? 0:28) }" y="0" clip="true">
+ height="${ canvas.height }" y="0" clip="true">
<attribute name="selected" value="null" />
<attribute name="isOpen" value="true" type="boolean"/>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/interviewuserlist/interviewUserList.lzx Thu Apr 14 11:46:52 2016
@@ -148,9 +148,6 @@
canvas.thishib.getCurrentModeratorList.doCall();
//FIXME Issue-1076
canvas.thishib.checkLzRecording.doCall();
- if (canvas._currentChatPanel.visible) {
- canvas._currentChatPanel.toggleopen();
- }
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/library.lzx Thu Apr 14 11:46:52 2016
@@ -45,8 +45,6 @@
<include href="popups/" />
<include href="moderation/" />
- <include href="conference/" />
-
<include href="participants/" />
<include href="interviewuserlist/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/library.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/moderation/library.lzx Thu Apr 14 11:46:52 2016
@@ -19,14 +19,5 @@
-->
<library>
-
- <resource name="applyformodicon_rsc" src="resources/user_add.png" />
-
- <!-- FamFam Icon Creative Commons -->
- <resource name="start_screensharing_rsc" src="resources/monitor_go.png" />
-
- <include href="applyForModeration.lzx" />
- <include href="moderationPanel.lzx" />
<include href="responseForModeration.lzx" />
-
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx Thu Apr 14 11:46:52 2016
@@ -395,23 +395,6 @@
_user_typing.setAttribute("visible", v);
</method>
- <miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16" height="16"
- resource="start_private_chat_rsc" showhandcursor="true"
- visible="${ (!canvas.currentRoomObj.chatHidden) && parent.refObj.publicSID != canvas.publicSID }">
-
- <handler name="onclick">
- var refObj = parent.refObj;
- if ($debug) Debug.write("Start Private Chat: ", refObj);
- if (refObj.publicSID == canvas.publicSID) {
- new lz.labelerrorPopup(canvas.main_content._content.inner
- , {errorlabelid:1495});
- return;
- }
- canvas._currentChatPanel.addChat(refObj);
- </handler>
- <labelTooltip labelid="1493" />
- </miniIcons>
-
<view name="_x" x="132" y="2">
<miniIcons name="_mute" x="82" width="16" height="16" resource="mute_micro_btn_rsc" showhandcursor="true" >
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/participants/participants.lzx Thu Apr 14 11:46:52 2016
@@ -163,9 +163,6 @@
canvas.thishib.getCurrentModeratorList.doCall();
canvas.thishib.checkLzRecording.doCall();
- if (canvas._currentChatPanel.visible) {
- canvas._currentChatPanel.toggleopen();
- }
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/popups/meetingTimer.lzx Thu Apr 14 11:46:52 2016
@@ -20,6 +20,7 @@
-->
<library>
+<!-- TODO move to HTML5 -->
<class name="meetingTimer" extends="labelExplorerBox" labelid="638"
docking="true" resizeable="false" closable="false" width="260"
x="$once{ canvas.width - this.width - 10 }" y="10" height="160">
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/moderationMiniIconRestricted.lzx Thu Apr 14 11:46:52 2016
@@ -134,9 +134,6 @@
this._muteDevice.setAttribute("visibility","visible");
this._unMuteDevice.setAttribute("visibility","hidden");
}
-
- this._start_private_chat_rsc.setAttribute('visible'
- , (!canvas.currentRoomObj.chatHidden) && (refObj != null && refObj.publicSID != canvas.publicSID));
]]>
</handler>
@@ -395,21 +392,6 @@
<labelTooltip labelid="1213" />
</miniIcons>
-
- <miniIcons name="_start_private_chat_rsc" x="172" y="2" width="16" height="16" resource="start_private_chat_rsc" showhandcursor="true">
-
- <handler name="onclick">
- var refObj = parent.parent.parent.refObj;
- if ($debug) Debug.write("Start Private Chat: ", refObj);
- if (refObj.publicSID == canvas.publicSID) {
- new lz.labelerrorPopup(canvas.main_content._content.inner
- ,{errorlabelid:1495});
- return;
- }
- canvas._currentChatPanel.addChat(refObj);
- </handler>
- <labelTooltip labelid="1493" />
- </miniIcons>
</class>
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/restricted/restrictedUserList.lzx Thu Apr 14 11:46:52 2016
@@ -162,10 +162,6 @@
//Render and Show User-List
parent._participants.sortAndRenderList();
-
- if (canvas._currentChatPanel.visible) {
- canvas._currentChatPanel.toggleopen();
- }
]]>
</handler>
</netRemoteCallHib>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/library.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/library.lzx Thu Apr 14 11:46:52 2016
@@ -28,6 +28,5 @@
<resource name="_filesave_icon_original_rsc" src="resources/download.png" />
<include href="fileexplorer/"/>
- <include href="chat/" />
</library>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/panels/propertypanel/propertyPanel.lzx Thu Apr 14 11:46:52 2016
@@ -21,7 +21,7 @@
<library>
<class name="propertyPanel" extends="basePropertyPanel"
- width="${ parent.parent.width-1 }" height="80" labelid="843" >
+ width="${ parent.parent.width-1 }" height="100" labelid="843" >
<attribute name="ignoreUpdates" value="false" type="boolean" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/library.lzx Thu Apr 14 11:46:52 2016
@@ -21,7 +21,6 @@
<library>
<include href="conference/" />
- <include href="chat/" />
<include href="invitation/" />
<include href="dashboard/" />
<include href="sipintegration/" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Apr 14 11:46:52 2016
@@ -35,7 +35,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletContext;
@@ -289,23 +288,26 @@ public class Application extends Authent
}
}
- public static Client addUserToRoom(long roomId, int pageId) {
+ public static Client addUserToRoom(Client c, int pageId) {
+ long roomId = c.getRoomId();
if (!ROOMS.containsKey(roomId)) {
ROOMS.put(roomId, new ConcurrentHashSet<Client>());
}
- Client c = new Client(WebSession.get().getId(), pageId, WebSession.getUserId());
- c.setUid(UUID.randomUUID().toString());
+ c.setSessionId(WebSession.get().getId());
+ c.setPageId(pageId);
ROOMS.get(roomId).add(c);
return c;
}
public static void removeUserFromRoom(long roomId, int pageId) {
- removeUserFromRoom(roomId, new Client(WebSession.get().getId(), pageId, WebSession.getUserId()));
+ Client c = new Client(WebSession.get().getId(), pageId, WebSession.getUserId());
+ c.setRoomId(roomId);
+ removeUserFromRoom(c);
}
- public static Client removeUserFromRoom(long roomId, Client _c) {
- if (ROOMS.containsKey(roomId)) {
- Set<Client> clients = ROOMS.get(roomId);
+ public static Client removeUserFromRoom(Client _c) {
+ if (ROOMS.containsKey(_c.getRoomId())) {
+ Set<Client> clients = ROOMS.get(_c.getRoomId());
for (Client c : clients) {
if (c.equals(_c)) {
clients.remove(c);
@@ -313,22 +315,12 @@ public class Application extends Authent
}
}
if (clients.isEmpty()) {
- ROOMS.remove(roomId);
+ ROOMS.remove(_c.getRoomId());
}
}
return _c;
}
- public static long getRoom(Client c) {
- for (Entry<Long, Set<Client>> me : ROOMS.entrySet()) {
- Set<Client> clients = me.getValue();
- if (clients.contains(c)) {
- return me.getKey();
- }
- }
- return -1;
- }
-
public static Set<Client> getRoomUsers(long roomId) {
return ROOMS.containsKey(roomId) ? ROOMS.get(roomId) : new HashSet<Client>();
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Thu Apr 14 11:46:52 2016
@@ -1908,4 +1908,5 @@
<entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry>
<entry key="dashboard.widget.admin.cleanup.warn">Are you sure you want to delete all temporary files? This operation cannot be undone.</entry>
<entry key="dashboard.widget.admin.cleanup.error">Unexpected error while performing cleanup</entry>
+ <entry key="room.action.request.right.moderator">would like to be moderator of this room.</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java Thu Apr 14 11:46:52 2016
@@ -21,6 +21,7 @@ package org.apache.openmeetings.web.app;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import java.util.UUID;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.wicket.protocol.ws.api.registry.IKey;
@@ -39,6 +40,7 @@ public class Client implements IDataProv
private String sessionId;
private int pageId;
private long userId;
+ private long roomId;
private String uid;
private Set<Right> rights = new HashSet<Right>();
private Date connectedSince;
@@ -47,6 +49,13 @@ public class Client implements IDataProv
this.connectedSince = new Date();
}
+ public Client(long roomId) {
+ this.connectedSince = new Date();
+ this.roomId = roomId;
+ this.userId = WebSession.getUserId();
+ uid = UUID.randomUUID().toString();
+ }
+
public Client(String sessionId, IKey key, long userId) {
this(sessionId, key.hashCode(), userId);
}
@@ -90,12 +99,48 @@ public class Client implements IDataProv
this.uid = uid;
}
+
+ public Set<Right> getRights() {
+ return rights;
+ }
+
+ public boolean hasRight(Right right) {
+ return rights.contains(Right.moderator) ? true : rights.contains(right);
+ }
+
+ public Date getConnectedSince() {
+ return connectedSince;
+ }
+
+ public void setConnectedSince(Date connectedSince) {
+ this.connectedSince = connectedSince;
+ }
+
+ @Override
+ public Long getId() {
+ return null;
+ }
+
+ @Override
+ public void setId(Long id) {
+ }
+
+ public long getRoomId() {
+ return roomId;
+ }
+
+ public void setRoomId(long roomId) {
+ this.roomId = roomId;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + pageId;
+ result = prime * result + (int) (roomId ^ (roomId >>> 32));
result = prime * result + ((sessionId == null) ? 0 : sessionId.hashCode());
+ result = prime * result + ((uid == null) ? 0 : uid.hashCode());
result = prime * result + (int) (userId ^ (userId >>> 32));
return result;
}
@@ -111,38 +156,20 @@ public class Client implements IDataProv
Client other = (Client) obj;
if (pageId != other.pageId)
return false;
+ if (roomId != other.roomId)
+ return false;
if (sessionId == null) {
if (other.sessionId != null)
return false;
} else if (!sessionId.equals(other.sessionId))
return false;
+ if (uid == null) {
+ if (other.uid != null)
+ return false;
+ } else if (!uid.equals(other.uid))
+ return false;
if (userId != other.userId)
return false;
return true;
}
-
- public Set<Right> getRights() {
- return rights;
- }
-
- public boolean hasRight(Right right) {
- return rights.contains(Right.moderator) ? true : rights.contains(right);
- }
-
- public Date getConnectedSince() {
- return connectedSince;
- }
-
- public void setConnectedSince(Date connectedSince) {
- this.connectedSince = connectedSince;
- }
-
- @Override
- public Long getId() {
- return null;
- }
-
- @Override
- public void setId(Long id) {
- }
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java Thu Apr 14 11:46:52 2016
@@ -39,7 +39,7 @@ public abstract class BasePanel extends
setOutputMarkupId(true);
}
- protected MainPage getMainPage() {
+ public MainPage getMainPage() {
return (MainPage)super.getPage();
}
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java?rev=1739063&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmButton.java Thu Apr 14 11:46:52 2016
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.common;
+
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import com.googlecode.wicket.jquery.ui.form.button.Button;
+
+public abstract class OmButton extends Button {
+ private static final long serialVersionUID = 1L;
+
+ public OmButton(String id) {
+ super(id);
+ add(new AjaxEventBehavior("click") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ OmButton.this.onClick(target);
+ }
+ });
+ }
+
+ protected abstract void onClick(AjaxRequestTarget target);
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuItem.java Thu Apr 14 11:46:52 2016
@@ -24,15 +24,12 @@ import com.googlecode.wicket.jquery.ui.w
public class MenuItem extends com.googlecode.wicket.jquery.ui.widget.menu.MenuItem {
private static final long serialVersionUID = 1L;
- protected String desc;
- private String cssClass;
-
- public MenuItem(String title) {
- super(title);
- }
+ private String desc;
+ private boolean top;
public MenuItem(String title, List<IMenuItem> items) {
super(title, items);
+ setTop(true);
}
public MenuItem(String title, String desc) {
@@ -48,11 +45,11 @@ public class MenuItem extends com.google
this.desc = desc;
}
- public String getCssClass() {
- return cssClass;
+ public boolean isTop() {
+ return top;
}
- public void setCssClass(String cssClass) {
- this.cssClass = cssClass;
+ public void setTop(boolean top) {
+ this.top = top;
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java Thu Apr 14 11:46:52 2016
@@ -52,14 +52,12 @@ public class MenuPanel extends BasePanel
protected void addMenuItem(ListItem<IMenuItem> item, IMenuItem menuItem) {
super.addMenuItem(item, menuItem);
MenuItem m = (MenuItem)menuItem;
- if (Strings.isEmpty(m.getDesc())) {
- item.add(AttributeAppender.append("class", "top"));
- } else {
- item.add(AttributeAppender.append("class", "sub"));
+ item.add(AttributeAppender.append("class", m.isTop() ? "top" : "sub"));
+ if (!Strings.isEmpty(m.getDesc())) {
item.add(AttributeAppender.append("title", m.getDesc()));
}
- if (!Strings.isEmpty(m.getCssClass())) {
- item.add(AttributeAppender.append("class", m.getCssClass()));
+ if (!Strings.isEmpty(m.getIcon())) {
+ item.add(AttributeAppender.append("class", m.getIcon()));
}
}
});
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java Thu Apr 14 11:46:52 2016
@@ -21,25 +21,17 @@ package org.apache.openmeetings.web.comm
public class RoomMenuItem extends MenuItem {
private static final long serialVersionUID = 1L;
- public RoomMenuItem(String name) {
- this(name, null);
- }
-
public RoomMenuItem(String name, String desc) {
- this(name, desc, true, null);
+ super(name, desc);
}
- public RoomMenuItem(String name, String desc, String cssClass) {
- this(name, desc, true, cssClass);
+ public RoomMenuItem(String name, String desc, String icon) {
+ super(name, desc);
+ setIcon(icon);
}
public RoomMenuItem(String name, String desc, boolean enabled) {
- this(name, desc, enabled, null);
- }
-
- public RoomMenuItem(String name, String desc, boolean enabled, String cssClass) {
super(name, desc);
- setCssClass(cssClass);
setEnabled(enabled);
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html Thu Apr 14 11:46:52 2016
@@ -29,10 +29,10 @@
</script>
<div class="file tree">
<div class="icons clear trash-toolbar" wicket:id="trash-toolbar">
+ <span wicket:id="upload" class="add om-icon align-left clickable" wicket:message="title:702"></span>
<span wicket:id="create" class="folder-create om-icon align-left clickable" wicket:message="title:703"></span>
<span wicket:id="refresh" class="refresh om-icon align-left clickable" wicket:message="title:704"></span>
- <span wicket:id="trash" class="trash om-icon align-right clickable"></span>
- <span style="padding-left: 20px;" wicket:message="title:705"><wicket:message key="1224"/></span>
+ <span wicket:id="trash" class="trash om-icon align-right clickable" wicket:message="title:705"></span>
<div class="clear"></div>
</div>
<div wicket:id="tree-container" class="trees">
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Thu Apr 14 11:46:52 2016
@@ -63,6 +63,11 @@ public abstract class FileTreePanel exte
public FileTreePanel(String id) {
super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
defineTrees();
selectedFile.getObject().setId(Long.MIN_VALUE);
final AddFolderDialog addFolder = new AddFolderDialog("addFolder", Application.getString(712)) {
@@ -94,6 +99,7 @@ public abstract class FileTreePanel exte
}
};
add(trashToolbar);
+ trashToolbar.add(getUpload("upload"));
trashToolbar.add(new WebMarkupContainer("create").add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@@ -133,6 +139,10 @@ public abstract class FileTreePanel exte
add(errorsDialog);
}
+ protected Component getUpload(String id) {
+ return new WebMarkupContainer(id).setVisible(false);
+ }
+
void delete(FileItem f, AjaxRequestTarget target) {
long id = f.getId();
if (id > 0) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.html Thu Apr 14 11:46:52 2016
@@ -38,7 +38,7 @@
Wicket.Event.subscribe('/ajax/call/complete', hideBusyIndicator);
});
</script>
- <div id="topControls">
+ <div wicket:id="topControls">
<div wicket:id="topLinks"><span
id="contactsAndMessages"><a wicket:id="messages"><wicket:message key="1188"/></a></span><span
id="profile"><a wicket:id="profile"><wicket:message key="5"/></a></span><span
@@ -46,10 +46,10 @@
id="reportBug"><a target="_blank" href="https://issues.apache.org/jira/browse/OPENMEETINGS"><wicket:message key="284"/></a></span><span><a
wicket:id="about"><wicket:message key="1549"/></a></span>
</div>
- <div wicket:id="dev" id="devMenu"/>
<div id="busy_indicator" class="ui-widget-header"><span><wicket:message key="1554"/></span></div>
<div wicket:id="menu"></div>
</div>
+ <div wicket:id="dev" id="devMenu"/>
<div wicket:id="contents"><div wicket:id="child"></div></div>
<div wicket:id="chatPanel"></div>
<div wicket:id="aboutDialog"></div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java Thu Apr 14 11:46:52 2016
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addOnlineUser;
import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.Application.getClientByKeys;
import static org.apache.openmeetings.web.app.Application.removeOnlineUser;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
@@ -48,6 +47,8 @@ import org.apache.openmeetings.web.commo
import org.apache.openmeetings.web.common.menu.MainMenuItem;
import org.apache.openmeetings.web.common.menu.MenuItem;
import org.apache.openmeetings.web.common.menu.MenuPanel;
+import org.apache.openmeetings.web.room.RoomPanel;
+import org.apache.openmeetings.web.room.menu.RoomMenuPanel;
import org.apache.openmeetings.web.user.AboutDialog;
import org.apache.openmeetings.web.user.ChatPanel;
import org.apache.openmeetings.web.user.InviteUserToRoomDialog;
@@ -72,10 +73,11 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
+import org.apache.wicket.protocol.ws.api.message.AbortedMessage;
+import org.apache.wicket.protocol.ws.api.message.AbstractClientMessage;
import org.apache.wicket.protocol.ws.api.message.ClosedMessage;
import org.apache.wicket.protocol.ws.api.message.ConnectedMessage;
import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -90,6 +92,7 @@ public class MainPage extends BaseInited
private static final Logger log = Red5LoggerFactory.getLogger(MainPage.class, webAppRootKey);
private final static String PARAM_USER_ID = "userId";
private final MenuPanel menu;
+ private final WebMarkupContainer topControls = new WebMarkupContainer("topControls");
private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
private final MarkupContainer contents;
private final AbstractAjaxTimerBehavior areaBehavior;
@@ -99,13 +102,14 @@ public class MainPage extends BaseInited
private final UserInfoDialog userInfo;
private final InviteUserToRoomDialog inviteUser;
- public MainPage(PageParameters pp) {
+ public MainPage() {
super();
getHeader().setVisible(false);
+ add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
menu = new MenuPanel("menu", getMainMenu());
contents = new WebMarkupContainer("contents");
add(contents.add(new WebMarkupContainer(CHILD_ID)).setOutputMarkupId(true).setMarkupId("contents"));
- add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
+ topControls.add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
topLinks.add(new AjaxLink<Void>("messages") {
private static final long serialVersionUID = 1L;
@@ -142,11 +146,11 @@ public class MainPage extends BaseInited
});
add(about);
if (getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled()) {
- add(dev = new DebugBar("dev"));
+ add(dev = new DebugBar("dev"));
dev.setOutputMarkupId(true);
} else {
dev = null;
- add(new EmptyPanel("dev").setVisible(false));
+ add(new EmptyPanel("dev").setVisible(false));
}
add(chat = new ChatPanel("chatPanel"));
@@ -216,11 +220,25 @@ public class MainPage extends BaseInited
}
@Override
+ protected void onAbort(AbortedMessage message) {
+ super.onAbort(message);
+ closeHandler(message);
+ }
+
+ @Override
protected void onClose(ClosedMessage message) {
- Client client = getClientByKeys(getUserId(), WebSession.get().getId());
- removeOnlineUser(client);
super.onClose(message);
- log.debug("WebSocketBehavior::onClose");
+ closeHandler(message);
+ }
+
+ private void closeHandler(AbstractClientMessage message) {
+ Client _c = new Client(message.getSessionId(), message.getKey(), getUserId());
+ removeOnlineUser(_c);
+ log.debug(String.format("WebSocketBehavior::onClose [session: %s, key: %s]", message.getSessionId(), message.getKey()));
+ if (MainPage.this.getCurrentPanel() instanceof RoomPanel) {
+ RoomPanel rp = (RoomPanel)MainPage.this.getCurrentPanel();
+ RoomMenuPanel.roomExit(rp);
+ }
}
});
add(new AbstractDefaultAjaxBehavior() {
@@ -321,6 +339,10 @@ public class MainPage extends BaseInited
return topLinks;
}
+ public WebMarkupContainer getTopControls() {
+ return topControls;
+ }
+
public ChatPanel getChat() {
return chat;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java?rev=1739063&r1=1739062&r2=1739063&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/SwfPage.java Thu Apr 14 11:46:52 2016
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.page
import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.web.room.RoomPanel;
+import org.apache.openmeetings.web.room.SwfPanel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
public class SwfPage extends BaseNotInitedPage {
@@ -32,7 +32,7 @@ public class SwfPage extends BaseNotInit
}
public SwfPage(PageParameters pp) {
- add(new RoomPanel("room", pp));
+ add(new SwfPanel("room", pp));
}
@Override