You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/19 13:40:38 UTC
[61/78] [abbrv] git commit: ISIS-537 Remove JS related to
Wicket-Extensions' ModalWindow. Now we use Wicket-Bootstrap's Modal
ISIS-537 Remove JS related to Wicket-Extensions' ModalWindow. Now we use Wicket-Bootstrap's Modal
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2533cefd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2533cefd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2533cefd
Branch: refs/heads/master
Commit: 2533cefd134f44eb20996e088bca04d2d625de10
Parents: f5163d5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 17 10:09:09 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 17 10:10:08 2014 +0300
----------------------------------------------------------------------
.../actions/ActionParametersFormPanel.java | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2533cefd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 7c2fc98..9fc07ab 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -160,9 +160,6 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
// (normally would be flushed when traverse to next page).
String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(IsisContext.getMessageBroker());
builder.append(errorMessagesIfAny);
-
- // resize, to show any feedback messages.
- builder.append("Wicket.Window.get().autoSizeWindow();\n");
// append the JS to the response.
String buf = builder.toString();
@@ -178,21 +175,6 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
- if(actionPromptIfAny != null) {
- // resize, to show any feedback messages.
-
- target.appendJavaScript(
- "window.setTimeout(" +
- "function() {\n " +
- " var ww = Wicket.Window.get();\n " +
- " ww.autoSizeWindow();\n " +
- // the hack that works for initial rendering of dialog on Chrome
- // (to manually adjust the margin) doesn't seem to work if there's an error
- // so have chosen just to leave things as the are
- // (really, the issue is with Wicket.Window.get().autoSizeWindow() anyway...)
- "}\n, 0);\n"
- );
- }
target.add(form);
}
};