From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 3 Nov 2011 13:19:17 +0000 (+0100)
Subject: Fixed dialog hiding
X-Git-Tag: 2.0.0_Beta_1~1630
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=78e4d55822e79d225fa8175cac2faf3c10b79055;p=GitHub%2FWoltLab%2FWCF.git

Fixed dialog hiding
---

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index e22460e560..60ce2c2607 100644
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -314,12 +314,14 @@ $.fn.extend({
 	 * 
 	 * @param	string		direction
 	 * @param	object		callback
+	 * @param	integer		duration
 	 * @returns	jQuery
 	 */
-	wcfBlindIn: function(direction, callback) {
+	wcfBlindIn: function(direction, callback, duration) {
 		if (!direction) direction = 'vertical';
+		if (!duration || !parseInt(duration)) duration = 200;
 		
-		return this.show(WCF.getEffect(this.getTagName(), 'blind'), { direction: direction }, 200, callback);
+		return this.show(WCF.getEffect(this.getTagName(), 'blind'), { direction: direction }, duration, callback);
 	},
 	
 	/**
@@ -327,12 +329,14 @@ $.fn.extend({
 	 * 
 	 * @param	string		direction
 	 * @param	object		callback
+	 * @param	integer		duration
 	 * @returns	jQuery
 	 */
-	wcfBlindOut: function(direction, callback) {
+	wcfBlindOut: function(direction, callback, duration) {
 		if (!direction) direction = 'vertical';
+		if (!duration || !parseInt(duration)) duration = 200;
 		
-		return this.hide(WCF.getEffect(this.getTagName(), 'blind'), { direction: direction }, 200, callback);
+		return this.hide(WCF.getEffect(this.getTagName(), 'blind'), { direction: direction }, duration, callback);
 	},
 	
 	/**
@@ -2759,7 +2763,7 @@ WCF.CloseOverlayHandler = {
 		this._bindListener();
 
 		if (this._callbacks.isset(identifier)) {
-			cosole.debug("[WCF.CloseOverlayHandler] identifier '" + identifier + "' is already bound to a callback");
+			console.debug("[WCF.CloseOverlayHandler] identifier '" + identifier + "' is already bound to a callback");
 			return false;
 		}
 
@@ -2831,7 +2835,7 @@ WCF.DOMNodeInsertedHandler = {
 		this._bindListener();
 
 		if (this._callbacks.isset(identifier)) {
-			cosole.debug("[WCF.DOMNodeInsertedHandler] identifier '" + identifier + "' is already bound to a callback");
+			console.debug("[WCF.DOMNodeInsertedHandler] identifier '" + identifier + "' is already bound to a callback");
 			return false;
 		}
 
@@ -2890,16 +2894,25 @@ $.widget('ui.wcfDialog', $.ui.dialog, {
 		this.options.hide = {
 			effect: 'fade'
 		};
-		this.options.close = function(event, ui) {
-			$(this).parent('.ui-dialog').empty().remove();
+
+		if (this.options.hideTitle) {
+			// remove title element
+			this.element.prev().empty().remove();
+		}
+
+		this.options.close = function() {
+			// "display: inline-block" is set by stylesheet, but additionally flagged
+			// with important, thus we have to force the dialog to stay hidden
+			$(this).parent('.ui-dialog').css({ display: 'none !important'});
 		};
+		
 		this.options.height = 'auto';
 		this.options.minHeight = 0;
 		this.options.modal = true;
 		this.options.width = 'auto';
 		
 		$.ui.dialog.prototype._init.apply(this, arguments);
-				
+		
 		// center dialog on resize
 		$(window).resize($.proxy(function() {
 			this.option('position', 'center');