This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 8369b5e83c ISIS-2985: remove support f. ModalDialog nesting
8369b5e83c is described below

commit 8369b5e83c9f21b036e317a770608ffe208e966c
Author: Andi Huber <[email protected]>
AuthorDate: Thu Jun 9 10:21:33 2022 +0200

    ISIS-2985: remove support f. ModalDialog nesting
    
    - was introduces in support of composite value types; however, I believe
    its no longer required
---
 .../ui/components/widgets/bootstrap/ModalDialog.java | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
index 8e7c89893f..5a702acea1 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/ModalDialog.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap;
 
-import java.util.Stack;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -29,8 +27,6 @@ import org.apache.wicket.model.IModel;
 import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
 import org.apache.isis.viewer.wicket.ui.util.Wkt;
 
-import lombok.val;
-
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 import 
de.agilecoders.wicket.extensions.markup.html.bootstrap.behavior.Draggable;
 import 
de.agilecoders.wicket.extensions.markup.html.bootstrap.behavior.DraggableConfig;
@@ -44,8 +40,6 @@ implements ActionPrompt {
 
     private static final long serialVersionUID = 1L;
 
-    private final Stack<Component> nestedPanelStack = new Stack<>();
-
     public ModalDialog(final String markupId) {
         this(markupId, null);
     }
@@ -66,10 +60,6 @@ implements ActionPrompt {
 
     @Override
     public void setPanel(final Component component, final AjaxRequestTarget 
target) {
-        if(!nestedPanelStack.isEmpty()) {
-            addJavaScriptForClosing(target);
-        }
-        nestedPanelStack.add(component);
         addOrReplace(component);
         showPrompt(target);
     }
@@ -93,18 +83,8 @@ implements ActionPrompt {
 
     @Override
     public void closePrompt(final AjaxRequestTarget target) {
-        if(!nestedPanelStack.isEmpty()) {
-            nestedPanelStack.pop();
-        }
-
         addJavaScriptForClosing(target);
         setVisible(false);
-
-        if(!nestedPanelStack.isEmpty()) {
-            val parentDialogContent = nestedPanelStack.peek();
-            addOrReplace(parentDialogContent);
-            showPrompt(target);
-        }
     }
 
     @Override

Reply via email to