[TASK] Cleanup ContextMenu calls 93/51793/3
authorBenni Mack <benni@typo3.org>
Wed, 22 Feb 2017 09:14:33 +0000 (10:14 +0100)
committerTymoteusz Motylewski <t.motylewski@gmail.com>
Wed, 22 Feb 2017 20:21:56 +0000 (21:21 +0100)
There are still some properties and additional method call arguments
that are not evaluated properly anymore and can be omitted.

Resolves: #79959
Releases: master
Change-Id: Ifc4ed71891394af4c80eaa9c4bb987f79c980a73
Reviewed-on: https://review.typo3.org/51793
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
Tested-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
typo3/sysext/backend/Classes/Form/FieldWizard/OtherLanguageContent.php
typo3/sysext/backend/Classes/Form/FieldWizard/RecordsOverview.php
typo3/sysext/filelist/Classes/FileList.php

index 042e03f..df68803 100644 (file)
@@ -139,7 +139,7 @@ class OtherLanguageContent extends AbstractNode
                         '',
                         $config['config']['uploadfolder'], 0, ' align="middle"'
                     ) .
-                    ($absFilePath ? BackendUtility::wrapClickMenuOnIcon($fileIcon, $absFilePath, 0, 1, '', '+copy,info,edit,view') : $fileIcon) .
+                    ($absFilePath ? BackendUtility::wrapClickMenuOnIcon($fileIcon, $absFilePath, 0) : $fileIcon) .
                     $imgPath .
                     '</span>';
             }
index af35eba..0e3ea4f 100644 (file)
@@ -61,18 +61,12 @@ class RecordsOverview extends AbstractNode
             $linkedIcon = BackendUtility::wrapClickMenuOnIcon(
                 $iconFactory->getIconForRecord($selectedItem['table'], $selectedItem['row'], Icon::SIZE_SMALL)->render(),
                 $selectedItem['table'],
-                $selectedItem['uid'],
-                1,
-                '',
-                '+copy,info,edit,view'
+                $selectedItem['uid']
             );
             $linkedTitle = BackendUtility::wrapClickMenuOnIcon(
                 $shortenedTitle,
                 $selectedItem['table'],
-                $selectedItem['uid'],
-                1,
-                '',
-                '+copy,info,edit,view'
+                $selectedItem['uid']
             );
             $recordsOverviewHtml[] = '<tr>';
             $recordsOverviewHtml[] =    '<td class="col-icon">';
index 6b1719d..1484bed 100644 (file)
@@ -70,13 +70,6 @@ class FileList extends AbstractRecordList
     public $fixedL = 30;
 
     /**
-     * If TRUE click menus are generated on files and folders
-     *
-     * @var bool
-     */
-    public $clickMenus = 1;
-
-    /**
      * The field to sort by
      *
      * @var string
@@ -517,7 +510,7 @@ class FileList extends AbstractRecordList
 
             // The icon with link
             $theIcon = '<span title="' . htmlspecialchars($folderName) . '">' . $this->iconFactory->getIconForResource($folderObject, Icon::SIZE_SMALL)->render() . '</span>';
-            if (!$isLocked && $this->clickMenus) {
+            if (!$isLocked) {
                 $theIcon = BackendUtility::wrapClickMenuOnIcon($theIcon, 'sys_file', $folderObject->getCombinedIdentifier());
             }
 
@@ -667,9 +660,7 @@ class FileList extends AbstractRecordList
             // The icon with link
             $theIcon = '<span title="' . htmlspecialchars($fileName . ' [' . (int)$fileObject->getUid() . ']') . '">'
                 . $this->iconFactory->getIconForResource($fileObject, Icon::SIZE_SMALL)->render() . '</span>';
-            if ($this->clickMenus) {
-                $theIcon = BackendUtility::wrapClickMenuOnIcon($theIcon, 'sys_file', $fileObject->getCombinedIdentifier());
-            }
+            $theIcon = BackendUtility::wrapClickMenuOnIcon($theIcon, 'sys_file', $fileObject->getCombinedIdentifier());
             // Preparing and getting the data-array
             $theData = [];
             foreach ($this->fieldArray as $field) {