Author: sebawagner
Date: Mon Sep 17 17:37:19 2012
New Revision: 1386737
URL: http://svn.apache.org/viewvc?rev=1386737&view=rev
Log:
Revert changes, remove datatables jQuery Plugin
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/media/
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java?rev=1386737&r1=1386736&r2=1386737&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
Mon Sep 17 17:37:19 2012
@@ -41,15 +41,7 @@ public abstract class PagedEntityListPan
dataView.setItemsPerPage(entitiesPerPage);
final Form<Void> f = new Form<Void>("pagingForm");
f.setOutputMarkupId(true);
- f.add(new AjaxPagingNavigator("navigator", dataView) {
- private static final long serialVersionUID =
1254170633257351152L;
-
- @Override
- protected void onAjaxEvent(AjaxRequestTarget target) {
- PagedEntityListPanel.this.onEvent(target);
- }
-
- }.setOutputMarkupId(true))
+ f.add(new AjaxPagingNavigator("navigator",
dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new
PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
.add(new
AjaxFormComponentUpdatingBehavior("onchange") {
private static final long
serialVersionUID = -7754441983330112248L;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1386737&r1=1386736&r2=1386737&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Mon Sep 17 17:37:19 2012
@@ -25,12 +25,8 @@ import org.apache.openmeetings.web.compo
import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
-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.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@@ -39,45 +35,9 @@ public class ConfigsPanel extends AdminP
private static final long serialVersionUID = -1L;
private ConfigForm form;
- private StringBuilder sb = new StringBuilder();
- //Testing instance
- private StringBuilder sb2 = new StringBuilder();
-
- @Override
- public void renderHead(HtmlHeaderContainer container) {
-
- IHeaderResponse response = container.getHeaderResponse();
-
response.render(CssHeaderItem.forUrl("media/css/demo_table_jui.css"));
-
response.render(JavaScriptHeaderItem.forUrl("media/js/jquery.dataTables.min.js"));
-
- AjaxRequestTarget target =
container.getRequestCycle().find(AjaxRequestTarget.class);
-
- if (target != null)
- {
- target.appendJavaScript(sb.toString());
- target.appendJavaScript(sb2.toString());
- }
- else
- {
-
response.render(JavaScriptHeaderItem.forScript(sb.toString(), "datatable"));
-
response.render(JavaScriptHeaderItem.forScript(sb2.toString(), "test2"));
- }
- }
-
public ConfigsPanel(String id) {
super(id);
- sb.append("$(function() { \n");
- sb.append(" $('#example').dataTable( { \n");
- sb.append(" \"sScrollY\": \"300px\", \n");
- sb.append(" \"bPaginate\": false \n");
- sb.append("} );\n");
- sb.append("} );");
-
- sb2.append("$(function() { \n");
- sb2.append("alert(\"TEST\"); \n");
- sb2.append("} );");
-
DataView<Configuration> dataView = new
DataView<Configuration>("configList"
, new
OmDataProvider<Configuration>(Configurationmanagement.class)) {
private static final long serialVersionUID =
8715559628755439596L;
@@ -106,8 +66,6 @@ public class ConfigsPanel extends AdminP
@Override
protected void onEvent(AjaxRequestTarget target) {
target.add(listContainer);
- target.appendJavaScript(sb.toString());
- target.appendJavaScript(sb2.toString());
}
});
