From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 11 Mar 2018 17:44:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.1~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b587e1545d9664c41533d7b7b6b2d7ec14d1efc7;p=GitHub%2FWoltLab%2FWCF.git

Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
#	wcfsetup/install/files/js/WCF.Combined.min.js
#	wcfsetup/install/files/js/WoltLabSuite.Core.min.js
---

b587e1545d9664c41533d7b7b6b2d7ec14d1efc7
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
index 5fa0d62512,7d0a26ea01..9c47775639
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
@@@ -25,15 -23,12 +25,16 @@@ define
  	var _activeDialog = null;
  	var _container = null;
  	var _dialogs = new Dictionary();
 -	var _dialogObjects = new ObjectMap();
  	var _dialogFullHeight = false;
 +	var _dialogObjects = new ObjectMap();
 +	var _dialogToObject = new Dictionary();
  	var _keyupListener = null;
  	var _staticDialogs = elByClass('jsStaticDialog');
+ 	var _validCallbacks = ['onBeforeClose', 'onClose', 'onShow'];
  	
 +	// list of supported `input[type]` values for dialog submit
 +	var _validInputTypes = ['number', 'password', 'search', 'tel', 'text', 'url'];
 +	
  	/**
  	 * @exports	WoltLabSuite/Core/Ui/Dialog
  	 */