Skip to content
Snippets Groups Projects
Commit 84edee6b authored by Andreas Fernandez's avatar Andreas Fernandez Committed by Nicole Cordes
Browse files

[BUGFIX] Cleanup in SelectTreeElement

* Remove unnecessary $treeData variable
* Fix broken JS in onChange handler
* Enforce int casting of $width

Resolves: #70272
Releases: master
Change-Id: I76b2233a30f6c033839f53404340485f7302f9ca
Reviewed-on: http://review.typo3.org/43697


Reviewed-by: default avatarHelmut Hummel <helmut.hummel@typo3.org>
Tested-by: default avatarAndreas Bouche <andreas.bouche@flagbit.de>
Reviewed-by: default avatarNicole Cordes <typo3@cordes.co>
Tested-by: default avatarNicole Cordes <typo3@cordes.co>
Reviewed-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
parent 2433dbdb
Branches
Tags
No related merge requests found
......@@ -98,7 +98,6 @@ class SelectTreeElement extends AbstractFormElement {
*/
$itemArray[] = $treeData;
$treeData = json_encode($itemArray);
$id = md5($parameterArray['itemFormElName']);
if (isset($config['size']) && (int)$config['size'] > 0) {
$height = (int)$config['size'] * 20;
......@@ -166,13 +165,13 @@ class SelectTreeElement extends AbstractFormElement {
$resultArray = $this->initializeResultArray();
$resultArray['extJSCODE'] .= LF .
'Ext.onReady(function() {
TYPO3.Components.Tree.StandardTreeItemData["' . $id . '"] = ' . $treeData . ';
TYPO3.Components.Tree.StandardTreeItemData["' . $id . '"] = ' . json_encode($itemArray) . ';
var tree' . $id . ' = new TYPO3.Components.Tree.StandardTree({
id: "' . $id . '",
showHeader: ' . (int)$header . ',
onChange: "' . $onChange . '",
onChange: ' . GeneralUtility::quoteJSvalue($onChange) . ',
countSelectedNodes: ' . count($selectedNodes) . ',
width: ' . $width . ',
width: ' . (int)$width . ',
listeners: {
click: function(node, event) {
if (typeof(node.attributes.checked) == "boolean") {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment