[wicket] branch master updated: Make it more clear what markup is produced for ModalWindow based on Panel and on Page

[mgrigorov]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b8877b8  Make it more clear what markup is produced for ModalWindow 
based on Panel and on Page
b8877b8 is described below

commit b8877b867e157482d4676a2f1f9c7cb604f07976
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Thu Aug 27 16:41:01 2020 +0300

    Make it more clear what markup is produced for ModalWindow based on Panel 
and on Page
    
    Minor improvements to ModalDialog
---
 .../wicket/extensions/ajax/markup/html/modal/ModalDialog.java | 11 +++++------
 .../wicket/extensions/ajax/markup/html/modal/ModalWindow.java |  3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
index c550ddd..8fa02b4 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalDialog.java
@@ -100,7 +100,7 @@ public class ModalDialog extends Panel
        /**
         * Factory method for the dialog markup around the content.
         * 
-        * @param overlayId
+        * @param dialogId
         *            id
         * @return overlay
         */
@@ -118,7 +118,7 @@ public class ModalDialog extends Panel
         */
        public void setContent(Component content)
        {
-               if (!content.getId().equals(CONTENT_ID))
+               if (!CONTENT_ID.equals(content.getId()))
                {
                        throw new IllegalArgumentException(
                                "Content must have wicket id set to 
ModalDialog.CONTENT_ID");
@@ -171,7 +171,7 @@ public class ModalDialog extends Panel
        {
                if (overlay.size() == 0)
                {
-                       throw new WicketRuntimeException("no content set");
+                       throw new 
WicketRuntimeException(String.format("ModalDialog with id '%s' has no content 
set!", getId()));
                }
 
                overlay.setVisible(true);
@@ -250,8 +250,7 @@ public class ModalDialog extends Panel
                {
                        protected CharSequence getPrecondition()
                        {
-                               return String.format("return 
attrs.event.target.id == '%s';",
-                                       overlay.getMarkupId());
+                               return String.format("return 
attrs.event.target.id === '%s';", overlay.getMarkupId());
                        }
                });
                return this;
@@ -307,4 +306,4 @@ public class ModalDialog extends Panel
                        close(target);
                }
        }
-}
\ No newline at end of file
+}
diff --git 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
index 5a8318c..eea20e9 100644
--- 
a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
+++ 
b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
@@ -49,7 +49,8 @@ import com.github.openjson.JSONObject;
 /**
  * Modal window component.
  * <p>
- * Modal window is a draggable window (with either div or iframe content) that 
prevent user from
+ * Modal window is a draggable window (with either &lt;div&gt; when used with 
a Panel or &lt;iframe&gt;
+ * when used with a Page content) that prevent user from
  * interacting the rest of page (using a mask) until the window is closed.
  * <p>
  * If you want this to work under IE, don't attach this component to a 
&lt;span&gt; tag, make sure