Repository: openmeetings Updated Branches: refs/heads/master cad42a08d -> a1d8c0d65
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a1d8c0d6 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a1d8c0d6 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a1d8c0d6 Branch: refs/heads/master Commit: a1d8c0d65a18c2c5aa08afef13a1e2781ecddd0b Parents: cad42a0 Author: Maxim Solodovnik <[email protected]> Authored: Sat Oct 7 23:51:24 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Oct 7 23:51:24 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/common/main.js | 4 +-- .../web/room/activities/ActivitiesPanel.java | 33 +++++++++++--------- .../web/room/sidebar/icon/ClientIcon.java | 5 +-- .../web/user/profile/MessagesContactsPanel.java | 5 +-- .../web/user/profile/UserSearchPanel.java | 9 +++--- .../web/util/CallbackFunctionHelper.java | 6 ++++ 6 files changed, 37 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js ---------------------------------------------------------------------- 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 e9f00fb..a04f3fe 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 @@ -5,14 +5,14 @@ Wicket.BrowserInfo.collectExtraInfo = function(info) { info.settings = JSON.stringify(getSettings()); }; function getSettings() { - const s = localStorage.getItem("openmeetings"); + let s = localStorage.getItem("openmeetings"); if (!!s) { s = JSON.parse(s); } return s || {}; } function saveSetting(name, val) { - let s = getSettings(); + const s = getSettings(); s[name] = val; localStorage.setItem("openmeetings", JSON.stringify(s)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index 2a0bf78..1ff9fa3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -25,6 +25,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick; import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -64,6 +65,8 @@ public class ActivitiesPanel extends Panel { private static final String PARAM_ID = "id"; private static final String ACTION = "action"; private static final String PARAM_ROOM_ID = "roomid"; + private static final String ACTIVITY_FMT = "%s %s [%s]"; + private static final String ACTIVITY_FUNC_FMT = "activityAction(%s, '%s', '%s');"; private enum Action { accept, decline, close }; @@ -159,9 +162,9 @@ public class ActivitiesPanel extends Panel { Activity a = item.getModelObject(); String text = ""; Long roomId = room.getRoom().getId(); - Component accept = new WebMarkupContainer("accept").add(AttributeModifier.append("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.accept.name(), a.getId()))); - Component decline = new WebMarkupContainer("decline").add(AttributeModifier.append("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.decline.name(), a.getId()))); - Component find = new WebMarkupContainer("find").add(AttributeModifier.append("onclick", String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false); + Component accept = new WebMarkupContainer("accept").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.accept.name(), a.getId()))); + Component decline = new WebMarkupContainer("decline").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.decline.name(), a.getId()))); + Component find = new WebMarkupContainer("find").add(addOnClick(String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false); boolean self = getUserId().equals(a.getSender()); switch (a.getType()) { case reqRightModerator: @@ -197,40 +200,40 @@ public class ActivitiesPanel extends Panel { item.setVisible(false); break; case roomExit: - text = String.format("%s %s [%s]", name, getString("1367"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("1367"), df.format(a.getCreated())); break; case reqRightModerator: - text = String.format("%s %s [%s]", name, getString("room.action.request.right.moderator"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("room.action.request.right.moderator"), df.format(a.getCreated())); break; case reqRightPresenter: - text = String.format("%s %s [%s]", name, getString("right.presenter.request"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("right.presenter.request"), df.format(a.getCreated())); break; case reqRightWb: - text = String.format("%s %s [%s]", name, getString("694"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("694"), df.format(a.getCreated())); break; case reqRightShare: - text = String.format("%s %s [%s]", name, getString("1070"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("1070"), df.format(a.getCreated())); break; case reqRightRemote: - text = String.format("%s %s [%s]", name, getString("1082"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("1082"), df.format(a.getCreated())); break; case reqRightA: - text = String.format("%s %s [%s]", name, getString("1603"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("1603"), df.format(a.getCreated())); break; case reqRightAv: - text = String.format("%s %s [%s]", name, getString("695"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("695"), df.format(a.getCreated())); break; case reqRightMute: - text = String.format("%s %s [%s]", name, getString("1399"), df.format(a.getCreated()));//TODO un-mute 1398 + text = String.format(ACTIVITY_FMT, name, getString("1399"), df.format(a.getCreated()));//TODO un-mute 1398 break; case reqRightExclusive: - text = String.format("%s %s [%s]", name, getString("1427"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("1427"), df.format(a.getCreated())); break; case haveQuestion: - text = String.format("%s %s [%s]", name, getString("693"), df.format(a.getCreated())); + text = String.format(ACTIVITY_FMT, name, getString("693"), df.format(a.getCreated())); break; } - item.add(new WebMarkupContainer("close").add(AttributeModifier.replace("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId())))); + item.add(new WebMarkupContainer("close").add(addOnClick(String.format(ACTIVITY_FUNC_FMT, roomId, Action.close.name(), a.getId())))); item.add(accept, decline, find, new Label("text", text)); item.add(AttributeModifier.append("class", getClass(a))); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java index c9b626b..13a953f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java @@ -19,6 +19,7 @@ package org.apache.openmeetings.web.room.sidebar.icon; import static org.apache.openmeetings.web.app.Application.getOnlineClient; +import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.web.room.RoomPanel; @@ -73,9 +74,9 @@ public abstract class ClientIcon extends WebMarkupContainer { if (isClickable()) { //request/remove cls.append(CLS_CLICKABLE); - add(AttributeModifier.replace("onclick", getScript())); + add(addOnClick(getScript())); } else { - add(AttributeModifier.replace("onclick", "")); + add(addOnClick("")); } internalUpdate(); add(AttributeModifier.replace("title", getTitle())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java index 72a621d..e62237a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.db.entity.user.PrivateMessage.TRASH_FOLDER import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getDateFormat; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick; import java.util.ArrayList; import java.util.Arrays; @@ -462,8 +463,8 @@ public class MessagesContactsPanel extends UserBasePanel { updateContacts(target); } }).setVisible(uc.isPending())); - item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId)))); - item.add(new WebMarkupContainer("message").add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId))).setVisible(!uc.isPending())); + item.add(new WebMarkupContainer("view").add(addOnClick(String.format("showUserInfo(%s);", userId)))); + item.add(new WebMarkupContainer("message").add(addOnClick(String.format("privateMessage(%s);", userId))).setVisible(!uc.isPending())); item.add(new ConfirmableAjaxBorder("delete", getString("80"), getString("833")) { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index 55b131a..9e488bd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -21,6 +21,7 @@ package org.apache.openmeetings.web.user.profile; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.isUserOnline; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick; import java.util.ArrayList; import java.util.Arrays; @@ -119,11 +120,11 @@ public class UserSearchPanel extends UserBasePanel { item.add(new Label("tz", getBean(TimezoneUtil.class).getTimeZone(u).getID())); item.add(new Label("offer", u.getUserOffers())); item.add(new Label("search", u.getUserSearchs())); - item.add(new WebMarkupContainer("view").add(AttributeModifier.append("onclick", String.format("showUserInfo(%s);", userId)))); + item.add(new WebMarkupContainer("view").add(addOnClick(String.format("showUserInfo(%s);", userId)))); item.add(new WebMarkupContainer("add").setVisible(userId != getUserId() && !contactsDao.isContact(userId, getUserId())) - .add(AttributeModifier.append("onclick", String.format("addContact(%s);", userId)))); - item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("privateMessage(%s);", userId)))); - item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(AttributeModifier.append("onclick", String.format("inviteUser(%s);", userId)))); + .add(addOnClick(String.format("addContact(%s);", userId)))); + item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(addOnClick(String.format("privateMessage(%s);", userId)))); + item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(addOnClick(String.format("inviteUser(%s);", userId)))); //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME } }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a1d8c0d6/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java index a013be3..dca35d9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java @@ -16,8 +16,10 @@ */ package org.apache.openmeetings.web.util; +import java.io.Serializable; import java.util.UUID; +import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.attributes.CallbackParameter; @@ -55,4 +57,8 @@ public class CallbackFunctionHelper { String uid = UUID.randomUUID().toString(); return JavaScriptHeaderItem.forScript(getNamedFunctionStr(name, b, extraParameters), String.format("%s-%s", name, uid)); } + + public static AttributeModifier addOnClick(Serializable handler) { + return AttributeModifier.replace("onclick", handler); + } }
