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 2017/05/01 06:09:02 UTC
[16/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1611] js
errors should be fixed
[OPENMEETINGS-1611] js errors should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6fec12b4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6fec12b4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6fec12b4
Branch: refs/heads/3.2.x
Commit: 6fec12b4bf7e6e2dcd58ca45e6197324d9962ae1
Parents: 60193a5
Author: Maxim Solodovnik <so...@apache.org>
Authored: Fri Mar 24 14:17:32 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Fri Mar 24 14:17:32 2017 +0000
----------------------------------------------------------------------
.../web/admin/configurations/ConfigForm.java | 2 +-
.../web/admin/configurations/ConfigsPanel.java | 2 +-
.../openmeetings/web/admin/ldaps/LdapForm.java | 8 +++----
.../web/admin/ldaps/LdapsPanel.java | 2 +-
.../openmeetings/web/admin/oauth/OAuthForm.java | 8 +++----
.../web/admin/oauth/OAuthPanel.java | 2 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../web/admin/rooms/RoomsPanel.java | 12 +---------
.../apache/openmeetings/web/admin/rooms/room.js | 23 --------------------
.../web/admin/servers/ServerForm.java | 8 +++----
.../web/admin/servers/ServersPanel.java | 2 +-
.../openmeetings/web/admin/users/UserForm.java | 4 ++--
12 files changed, 21 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 9418869..5a8393e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -54,7 +54,7 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
private void refresh(AjaxRequestTarget target) {
target.add(this);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
index 1223ef7..c0c91d0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
@@ -65,7 +65,7 @@ public class ConfigsPanel extends AdminPanel {
form.hideNewRecord();
form.setModelObject(c);
target.add(form, listContainer);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(c.getId(), form.getModelObject().getId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
index a1660a6..b4cca0a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
@@ -76,14 +76,14 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
target.add(this, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new LdapConfig());
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -96,7 +96,7 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
}
this.setModelObject(ldapConfig);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -105,7 +105,7 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
this.setModelObject(new LdapConfig());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
index 5388f16..4d51408 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
@@ -64,7 +64,7 @@ public class LdapsPanel extends AdminPanel {
form.setModelObject(lc);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(lc.getId(), form.getModelObject().getId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index 702bf55..a7b60a1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -86,14 +86,14 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new OAuthServer());
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
}
this.setModelObject(server);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
this.setModelObject(new OAuthServer());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
index ef4d40c..c5a4540 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
@@ -58,7 +58,7 @@ public class OAuthPanel extends AdminPanel {
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index f2e3a2a..aa234b5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -401,7 +401,7 @@ public class RoomForm extends AdminBaseForm<Room> {
target.add(roomList);
target.add(pin.setEnabled(getModelObject().isSipEnabled()));
updateClients(target);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
index caa7891..0fa1f60 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
@@ -32,17 +32,13 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
public class RoomsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
- private final static JavaScriptResourceReference ROOM_FUNCTIONS = new JavaScriptResourceReference(RoomsPanel.class, "room.js");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
@@ -67,7 +63,7 @@ public class RoomsPanel extends AdminPanel {
form.setModelObject(getBean(RoomDao.class).get(roomId));
form.updateView(target);
target.add(form, listContainer);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
@@ -92,10 +88,4 @@ public class RoomsPanel extends AdminPanel {
add(form = new RoomForm("form", listContainer, new Room()));
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(ROOM_FUNCTIONS));
- }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js
deleted file mode 100644
index e1373a0..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * 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.
- */
-function omRoomPanelInit() {
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight - 114);
- $('#adminTable').height(documentHeight - 144);
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
index dd9043b..e93a4a2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
@@ -83,7 +83,7 @@ public class ServerForm extends AdminBaseForm<Server> {
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -93,7 +93,7 @@ public class ServerForm extends AdminBaseForm<Server> {
s.setProtocol("http");
setModelObject(s);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class ServerForm extends AdminBaseForm<Server> {
}
setModelObject(server);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class ServerForm extends AdminBaseForm<Server> {
this.setModelObject(new Server());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
index ebc7559..b7889b3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
@@ -64,7 +64,7 @@ public class ServersPanel extends AdminPanel {
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fec12b4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 132158c..30644c6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -133,7 +133,7 @@ public class UserForm extends AdminBaseForm<User> {
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
if (u.getGroupUsers().isEmpty()) {
warning.open(target);
}
@@ -273,7 +273,7 @@ public class UserForm extends AdminBaseForm<User> {
updateDomain(target);
if (target != null) {
target.add(this, listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
}