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/25 20:26:36 UTC
svn commit: r1740875 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/
trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/
Author: solomax
Date: Mon Apr 25 18:26:35 2016
New Revision: 1740875
URL: http://svn.apache.org/viewvc?rev=1740875&view=rev
Log:
[OPENMEETINGS-1120] hidden activities works
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1740875&r1=1740874&r2=1740875&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Mon Apr 25 18:26:35 2016
@@ -226,7 +226,9 @@ public class ActivitiesPanel extends Bas
public void add(Activity a, IPartialPageRequestHandler handler) {
activities.put(a.getId(), a);
update(handler);
- handler.appendJavaScript("hightlightActivities();");
+ if (isVisible()) {
+ handler.appendJavaScript("hightlightActivities();");
+ }
}
public void remove(String uid, IPartialPageRequestHandler handler) {
@@ -235,8 +237,10 @@ public class ActivitiesPanel extends Bas
}
public void update(IPartialPageRequestHandler handler) {
- lv.setList(new ArrayList<>(activities.values()));
- handler.add(container);
+ if (isVisible()) {
+ lv.setList(new ArrayList<>(activities.values()));
+ handler.add(container);
+ }
}
public ActivitiesPanel(String id, RoomPanel room) {
@@ -245,7 +249,7 @@ public class ActivitiesPanel extends Bas
setVisible(!room.getRoom().isHidden(RoomElement.Activities));
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
- add(container.add(lv).setOutputMarkupId(true));
+ add(container.add(lv).setOutputMarkupPlaceholderTag(true));
add(action);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1740875&r1=1740874&r2=1740875&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Mon Apr 25 18:26:35 2016
@@ -226,7 +226,9 @@ public class ActivitiesPanel extends Bas
public void add(Activity a, IPartialPageRequestHandler handler) {
activities.put(a.getId(), a);
update(handler);
- handler.appendJavaScript("hightlightActivities();");
+ if (isVisible()) {
+ handler.appendJavaScript("hightlightActivities();");
+ }
}
public void remove(String uid, IPartialPageRequestHandler handler) {
@@ -235,8 +237,10 @@ public class ActivitiesPanel extends Bas
}
public void update(IPartialPageRequestHandler handler) {
- lv.setList(new ArrayList<>(activities.values()));
- handler.add(container);
+ if (isVisible()) {
+ lv.setList(new ArrayList<>(activities.values()));
+ handler.add(container);
+ }
}
public ActivitiesPanel(String id, RoomPanel room) {
@@ -245,7 +249,7 @@ public class ActivitiesPanel extends Bas
setVisible(!room.getRoom().isHidden(RoomElement.Activities));
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
- add(container.add(lv).setOutputMarkupId(true));
+ add(container.add(lv).setOutputMarkupPlaceholderTag(true));
add(action);
}