Author: solomax
Date: Tue Dec 20 16:10:11 2016
New Revision: 1775313
URL: http://svn.apache.org/viewvc?rev=1775313&view=rev
Log:
[OPENMEETINGS-895] named functions are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
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/room/RoomPanel.java
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/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
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/util/CallbackFunctionHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/application/trunk/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/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Tue Dec 20 16:10:11 2016
@@ -18,10 +18,12 @@
*/
package org.apache.openmeetings.web.common;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+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.LEVEL_ADMIN;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_GROUP_ADMIN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_USER;
+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.removeOnlineUser;
@@ -33,8 +35,6 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import static org.apache.openmeetings.web.util.OmUrlFragment.getPanel;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
-import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import java.io.IOException;
import java.util.ArrayList;
@@ -68,7 +68,6 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -206,7 +205,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("showUserInfo",
this, explicit(PARAM_USER_ID)), "showUserInfo")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("showUserInfo", this,
explicit(PARAM_USER_ID))));
}
});
add(new AbstractDefaultAjaxBehavior() {
@@ -220,7 +219,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("addContact",
this, explicit(PARAM_USER_ID)), "addContact")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("addContact", this,
explicit(PARAM_USER_ID))));
}
});
add(new AbstractDefaultAjaxBehavior() {
@@ -234,7 +233,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("privateMessage",
this, explicit(PARAM_USER_ID)), "privateMessage")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("privateMessage", this,
explicit(PARAM_USER_ID))));
}
});
add(pingTimer, new WebSocketBehavior() {
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=1775313&r1=1775312&r2=1775313&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
Tue Dec 20 16:10:11 2016
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.web.pages;
+import static org.apache.openmeetings.web.common.MainPanel.PARAM_USER_ID;
import static
org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import static org.apache.openmeetings.web.common.MainPanel.PARAM_USER_ID;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.MainPanel;
@@ -34,7 +34,6 @@ import org.apache.wicket.ajax.AjaxReques
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.util.time.Duration;
@@ -73,7 +72,7 @@ public class MainPage extends BaseInited
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("inviteUser",
this, explicit(PARAM_USER_ID)), "inviteUser")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("inviteUser", this,
explicit(PARAM_USER_ID))));
}
});
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Tue Dec 20 16:10:11 2016
@@ -496,7 +496,7 @@ public class RoomPanel extends BasePanel
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(newResourceReference())));
if (room.isVisible()) {
response.render(OnDomReadyHeaderItem.forScript(aab.getCallbackScript()));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("setActiveWbId",
activeWb, explicit(PARAM_WB_ID)), "setActiveWbId")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("setActiveWbId", activeWb,
explicit(PARAM_WB_ID))));
}
}
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=1775313&r1=1775312&r2=1775313&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
Tue Dec 20 16:10:11 2016
@@ -150,7 +150,7 @@ public class ActivitiesPanel extends Bas
@Override
public void renderHead(Component component, IHeaderResponse
response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("activityAction",
this, explicit(PARAM_ROOM_ID), explicit(ACTION), explicit(PARAM_ID)),
"activityAction")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("activityAction", this,
explicit(PARAM_ROOM_ID), explicit(ACTION), explicit(PARAM_ID))));
}
};
private ListView<Activity> lv = new ListView<Activity>("activities",
new ArrayList<Activity>()) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Dec 20 16:10:11 2016
@@ -41,7 +41,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -252,9 +251,9 @@ public class RoomSidebar extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_TOGGLE_RIGHT,
toggleRight, explicit(PARAM_RIGHT), explicit(PARAM_UID)), FUNC_TOGGLE_RIGHT)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_TOGGLE_ACTIVITY,
toggleActivity, explicit(PARAM_ACTIVITY), explicit(PARAM_UID),
explicit(PARAM_POD)), FUNC_TOGGLE_ACTIVITY)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_ACTION,
roomAction, explicit(PARAM_ACTION), explicit(PARAM_UID)), FUNC_ACTION)));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_TOGGLE_RIGHT, toggleRight,
explicit(PARAM_RIGHT), explicit(PARAM_UID))));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_TOGGLE_ACTIVITY, toggleActivity,
explicit(PARAM_ACTIVITY), explicit(PARAM_UID), explicit(PARAM_POD))));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_ACTION, roomAction,
explicit(PARAM_ACTION), explicit(PARAM_UID))));
}
private ListView<Client> updateUsers() {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
Tue Dec 20 16:10:11 2016
@@ -41,7 +41,7 @@ public abstract class RoomActivityIcon e
@Override
protected String getScript() {
- return String.format("%s('%s', '%s', '%s');",
FUNC_TOGGLE_ACTIVITY, activity.name(), client.getUid(), pod.name());
+ return String.format("%s('%s', '%s', '%s');",
FUNC_TOGGLE_ACTIVITY, activity.name(), client.getUid(), pod.ordinal());
}
protected boolean visible() {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
Tue Dec 20 16:10:11 2016
@@ -240,7 +240,7 @@ public class ChatPanel extends BasePanel
super.renderHead(response);
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(ChatPanel.class, "chat.js"))));
response.render(CssHeaderItem.forUrl("css/chat.css"));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("acceptMessage",
acceptMessage, explicit(PARAM_ROOM_ID), explicit(PARAM_MSG_ID)),
"acceptMessage")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("acceptMessage", acceptMessage,
explicit(PARAM_ROOM_ID), explicit(PARAM_MSG_ID))));
if (!showDashboardChat) {
StringBuilder sb = new StringBuilder();
sb.append("$(document).ready(function(){");
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
Tue Dec 20 16:10:11 2016
@@ -16,13 +16,16 @@
*/
package org.apache.openmeetings.web.util;
+import java.util.UUID;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.util.string.StringValue;
public class CallbackFunctionHelper {
- public static StringBuilder getNamedFunction(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
+ private static StringBuilder getNamedFunctionStr(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
StringBuilder sb = new StringBuilder();
sb.append("function ").append(name).append("(");
boolean first = true;
@@ -45,4 +48,9 @@ public class CallbackFunctionHelper {
public static StringValue getParam(Component cmp, String name) {
return
cmp.getRequest().getRequestParameters().getParameterValue(name);
}
+
+ public static JavaScriptHeaderItem getNamedFunction(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
+ String uid = UUID.randomUUID().toString();
+ return JavaScriptHeaderItem.forScript(getNamedFunctionStr(name,
b, extraParameters), String.format("%s-%s", name, uid));
+ }
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
Tue Dec 20 16:10:11 2016
@@ -9,7 +9,7 @@
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
@@ -18,7 +18,10 @@
under the License.
-->
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://www.zeroturnaround.com";
xsi:schemaLocation="http://www.zeroturnaround.com
http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd";>
+<application
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://www.zeroturnaround.com";
+ xsi:schemaLocation="http://www.zeroturnaround.com
https://update.zeroturnaround.com/alderaan/rebel-2_0.xsd";>
<classpath>
<dir name="${project.root}/build/classes/eclipse"/>
</classpath>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
Tue Dec 20 16:10:11 2016
@@ -68,7 +68,6 @@ import org.apache.wicket.ajax.markup.htm
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -205,7 +204,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("showUserInfo",
this, explicit(PARAM_USER_ID)), "showUserInfo")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("showUserInfo", this,
explicit(PARAM_USER_ID))));
}
});
add(new AbstractDefaultAjaxBehavior() {
@@ -219,7 +218,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("addContact",
this, explicit(PARAM_USER_ID)), "addContact")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("addContact", this,
explicit(PARAM_USER_ID))));
}
});
add(new AbstractDefaultAjaxBehavior() {
@@ -233,7 +232,7 @@ public class MainPanel extends Panel {
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("privateMessage",
this, explicit(PARAM_USER_ID)), "privateMessage")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("privateMessage", this,
explicit(PARAM_USER_ID))));
}
});
add(pingTimer, new WebSocketBehavior() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
Tue Dec 20 16:10:11 2016
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.web.pages;
+import static org.apache.openmeetings.web.common.MainPanel.PARAM_USER_ID;
import static
org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getParam;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-import static org.apache.openmeetings.web.common.MainPanel.PARAM_USER_ID;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.MainPanel;
@@ -34,7 +34,6 @@ import org.apache.wicket.ajax.AjaxReques
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.util.time.Duration;
@@ -73,7 +72,7 @@ public class MainPage extends BaseInited
@Override
public void renderHead(Component component,
IHeaderResponse response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("inviteUser",
this, explicit(PARAM_USER_ID)), "inviteUser")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("inviteUser", this,
explicit(PARAM_USER_ID))));
}
});
}
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=1775313&r1=1775312&r2=1775313&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
Tue Dec 20 16:10:11 2016
@@ -150,7 +150,7 @@ public class ActivitiesPanel extends Bas
@Override
public void renderHead(Component component, IHeaderResponse
response) {
super.renderHead(component, response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("activityAction",
this, explicit(PARAM_ROOM_ID), explicit(ACTION), explicit(PARAM_ID)),
"activityAction")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("activityAction", this,
explicit(PARAM_ROOM_ID), explicit(ACTION), explicit(PARAM_ID))));
}
};
private ListView<Activity> lv = new ListView<Activity>("activities",
new ArrayList<Activity>()) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Tue Dec 20 16:10:11 2016
@@ -41,7 +41,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.PriorityHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -252,9 +251,9 @@ public class RoomSidebar extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_TOGGLE_RIGHT,
toggleRight, explicit(PARAM_RIGHT), explicit(PARAM_UID)), FUNC_TOGGLE_RIGHT)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_TOGGLE_ACTIVITY,
toggleActivity, explicit(PARAM_ACTIVITY), explicit(PARAM_UID),
explicit(PARAM_POD)), FUNC_TOGGLE_ACTIVITY)));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction(FUNC_ACTION,
roomAction, explicit(PARAM_ACTION), explicit(PARAM_UID)), FUNC_ACTION)));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_TOGGLE_RIGHT, toggleRight,
explicit(PARAM_RIGHT), explicit(PARAM_UID))));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_TOGGLE_ACTIVITY, toggleActivity,
explicit(PARAM_ACTIVITY), explicit(PARAM_UID), explicit(PARAM_POD))));
+ response.render(new
PriorityHeaderItem(getNamedFunction(FUNC_ACTION, roomAction,
explicit(PARAM_ACTION), explicit(PARAM_UID))));
}
private ListView<Client> updateUsers() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/RoomActivityIcon.java
Tue Dec 20 16:10:11 2016
@@ -41,7 +41,7 @@ public abstract class RoomActivityIcon e
@Override
protected String getScript() {
- return String.format("%s('%s', '%s', '%s');",
FUNC_TOGGLE_ACTIVITY, activity.name(), client.getUid(), pod.name());
+ return String.format("%s('%s', '%s', '%s');",
FUNC_TOGGLE_ACTIVITY, activity.name(), client.getUid(), pod.ordinal());
}
protected boolean visible() {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
Tue Dec 20 16:10:11 2016
@@ -240,7 +240,7 @@ public class ChatPanel extends BasePanel
super.renderHead(response);
response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new
JavaScriptResourceReference(ChatPanel.class, "chat.js"))));
response.render(CssHeaderItem.forUrl("css/chat.css"));
- response.render(new
PriorityHeaderItem(JavaScriptHeaderItem.forScript(getNamedFunction("acceptMessage",
acceptMessage, explicit(PARAM_ROOM_ID), explicit(PARAM_MSG_ID)),
"acceptMessage")));
+ response.render(new
PriorityHeaderItem(getNamedFunction("acceptMessage", acceptMessage,
explicit(PARAM_ROOM_ID), explicit(PARAM_MSG_ID))));
if (!showDashboardChat) {
StringBuilder sb = new StringBuilder();
sb.append("$(document).ready(function(){");
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CallbackFunctionHelper.java
Tue Dec 20 16:10:11 2016
@@ -16,13 +16,16 @@
*/
package org.apache.openmeetings.web.util;
+import java.util.UUID;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.util.string.StringValue;
public class CallbackFunctionHelper {
- public static StringBuilder getNamedFunction(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
+ private static StringBuilder getNamedFunctionStr(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
StringBuilder sb = new StringBuilder();
sb.append("function ").append(name).append("(");
boolean first = true;
@@ -45,4 +48,9 @@ public class CallbackFunctionHelper {
public static StringValue getParam(Component cmp, String name) {
return
cmp.getRequest().getRequestParameters().getParameterValue(name);
}
+
+ public static JavaScriptHeaderItem getNamedFunction(String name,
AbstractDefaultAjaxBehavior b, CallbackParameter... extraParameters) {
+ String uid = UUID.randomUUID().toString();
+ return JavaScriptHeaderItem.forScript(getNamedFunctionStr(name,
b, extraParameters), String.format("%s-%s", name, uid));
+ }
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml?rev=1775313&r1=1775312&r2=1775313&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/rebel.xml
Tue Dec 20 16:10:11 2016
@@ -9,7 +9,7 @@
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
@@ -18,7 +18,10 @@
under the License.
-->
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://www.zeroturnaround.com";
xsi:schemaLocation="http://www.zeroturnaround.com
http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd";>
+<application
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://www.zeroturnaround.com";
+ xsi:schemaLocation="http://www.zeroturnaround.com
https://update.zeroturnaround.com/alderaan/rebel-2_0.xsd";>
<classpath>
<dir name="${project.root}/build/classes/eclipse"/>
</classpath>
