Fixed initialization of `UI/Dialog` and improved `close()`

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/UI/Dialog.js b/wcfsetup/install/files/js/WoltLab/WCF/UI/Dialog.js
index aafaf56fb98495cd91e35bf74f41914100cc930c..8e445e8e3c21f0de5c1129b84258ca2822320a50 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/UI/Dialog.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/UI/Dialog.js
@@ -101,7 +101,7 @@ define(
                                setupData.source = document.createDocumentFragment();
                                setupData.source.appendChild(dialogElement);
                        }
-                       else if (typeof setupData.source === null) {
+                       else if (setupData.source === null) {
                                // `null` means there is no static markup and `html` should be used instead
                                setupData.source = html;
                        }
@@ -439,9 +439,16 @@ define(
                /**
                 * Closes a dialog identified by given id.
                 * 
-                * @param       {string}        id      element id
+                * @param       {(string|object)}       id      element id or callback object
                 */
                close: function(id) {
+                       if (typeof id === 'object') {
+                               var dialogData = _dialogObjects.get(id);
+                               if (dialogData !== undefined) {
+                                       id = dialogData.id;
+                               }
+                       }
+                       
                        var data = _dialogs.get(id);
                        if (data === undefined) {
                                throw new Error("Expected a valid dialog id, '" + id + "' does not match any active dialog.");