From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 3 Nov 2020 10:14:50 +0000 (+0100)
Subject: Merge branch '5.2' into 5.3
X-Git-Tag: 5.3.0~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=012d5e5dbe4a06833f012aa2320c191fd65e49d8;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.2' into 5.3
---

012d5e5dbe4a06833f012aa2320c191fd65e49d8
diff --cc com.woltlab.wcf/templates/__pollOptionsFormField.tpl
index e4df57bf6d,6e3460dc23..f18e918762
--- a/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/__pollOptionsFormField.tpl
@@@ -1,14 -1,21 +1,21 @@@
  <ol class="sortableList"></ol>
  
  <script data-relocate="true">
- 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
+ 	require([
+ 		'Dom/Traverse',
+ 		'Dom/Util',
+ 		'EventHandler',
+ 		'Language',
+ 		'WoltLabSuite/Core/Form/Builder/Manager',
+ 		'WoltLabSuite/Core/Ui/Poll/Editor'
+ 	], function(DomTraverse, DomUtil, EventHandler, Language, FormBuilderManager, UiPollEditor) {
  		Language.addObject({
 -			'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
 -			'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}',
 -			'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}'
 +			'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
 +			'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}',
 +			'wcf.poll.maxVotes.error.invalid': '{jslang}wcf.poll.maxVotes.error.invalid{/jslang}'
  		});
  		
- 		new UiPollEditor(
+ 		var pollEditor = new UiPollEditor(
  			DomUtil.identify(DomTraverse.childByTag(elById('{@$field->getPrefixedId()}Container'), 'DD')),
  			[ {implode from=$field->getValue() item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ],
  			'{@$field->getPrefixedWysiwygId()}',
diff --cc wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
index e4df57bf6d,6e3460dc23..f18e918762
--- a/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__pollOptionsFormField.tpl
@@@ -1,14 -1,21 +1,21 @@@
  <ol class="sortableList"></ol>
  
  <script data-relocate="true">
- 	require(['Dom/Traverse', 'Dom/Util', 'Language', 'WoltLabSuite/Core/Ui/Poll/Editor'], function(DomTraverse, DomUtil, Language, UiPollEditor) {
+ 	require([
+ 		'Dom/Traverse',
+ 		'Dom/Util',
+ 		'EventHandler',
+ 		'Language',
+ 		'WoltLabSuite/Core/Form/Builder/Manager',
+ 		'WoltLabSuite/Core/Ui/Poll/Editor'
+ 	], function(DomTraverse, DomUtil, EventHandler, Language, FormBuilderManager, UiPollEditor) {
  		Language.addObject({
 -			'wcf.poll.button.addOption': '{lang}wcf.poll.button.addOption{/lang}',
 -			'wcf.poll.button.removeOption': '{lang}wcf.poll.button.removeOption{/lang}',
 -			'wcf.poll.maxVotes.error.invalid': '{lang}wcf.poll.maxVotes.error.invalid{/lang}'
 +			'wcf.poll.button.addOption': '{jslang}wcf.poll.button.addOption{/jslang}',
 +			'wcf.poll.button.removeOption': '{jslang}wcf.poll.button.removeOption{/jslang}',
 +			'wcf.poll.maxVotes.error.invalid': '{jslang}wcf.poll.maxVotes.error.invalid{/jslang}'
  		});
  		
- 		new UiPollEditor(
+ 		var pollEditor = new UiPollEditor(
  			DomUtil.identify(DomTraverse.childByTag(elById('{@$field->getPrefixedId()}Container'), 'DD')),
  			[ {implode from=$field->getValue() item=pollOption}{ optionID: {@$pollOption[optionID]}, optionValue: '{$pollOption[optionValue]|encodeJS}' }{/implode} ],
  			'{@$field->getPrefixedWysiwygId()}',