This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 7e4646e [OPENMEETINGS-2535] main panel is not being re-rendered
7e4646e is described below
commit 7e4646ec916ac1c4dc344849de9dc7b90108a2c2
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Dec 4 23:33:46 2020 +0700
[OPENMEETINGS-2535] main panel is not being re-rendered
---
.../main/java/org/apache/openmeetings/web/common/MainPanel.java | 5 ++---
.../src/main/java/org/apache/openmeetings/web/common/main.js | 8 +++++++-
.../main/java/org/apache/openmeetings/web/room/raw-activities.js | 4 +---
.../main/java/org/apache/openmeetings/web/user/chat/raw-chat.js | 4 +---
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 859aff5..3d39771 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.common;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.PARAM_USER_ID;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.isMyRoomsEnabled;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -63,7 +62,6 @@ import
org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.OmUrlFragment.MenuActions;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
@@ -418,7 +416,8 @@ public class MainPanel extends Panel {
if (prev != null) {
prev.cleanup(handler);
}
- handler.add(contents.replace(inPanel),
this.add(AttributeModifier.replace(ATTR_CLASS, "main " +
inPanel.getCssClass())));
+ handler.add(contents.replace(inPanel));
+ handler.appendJavaScript("$('#" + this.getMarkupId() +
"').attr('class', 'main " + inPanel.getCssClass() + "');");
inPanel.onMenuPanelLoad(handler);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index 97129b1..15cef54 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -106,7 +106,13 @@ var OmUtil = (function() {
};
self.ping = function() {
setTimeout(() => OmUtil.sendMessage({type: 'ping'}), 30000);
- } ;
+ };
+ self.notify = function(msg, tag) {
+ const opts = {
+ tag: tag
+ };
+ new Notification(msg, opts);
+ }
return self;
})();
Wicket.BrowserInfo.collectExtraInfo = function(info) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
index e52f0dc..4425ae7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
@@ -82,9 +82,7 @@ var Activities = function() {
$('.control.block', activities).addClass('bg-warning');
if (window === window.parent && notify) {
function _newMessage() {
- new Notification(newActNotification, {
- tag: 'new_aa_item'
- });
+ OmUtil.notify(newActNotification,
'new_aa_item');
}
if (Notification.permission === 'granted') {
_newMessage();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index 38d4620..36e0258 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -324,9 +324,7 @@ var Chat = function() {
if (p.is(':visible') && !muted) {
if (window === window.parent) {
function _newMessage() {
- new
Notification(newMsgNotification, {
- tag:
'new_chat_msg'
- });
+
OmUtil.notify(newMsgNotification, 'new_chat_msg');
}
if (Notification.permission ===
'granted') {
_newMessage();
