[TASK] Remove leftover code from old pagetree 23/47023/2
authorBenni Mack <benni@typo3.org>
Thu, 3 Mar 2016 20:07:46 +0000 (21:07 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Thu, 3 Mar 2016 21:26:48 +0000 (22:26 +0100)
Resolves: #74097
Releases: master
Change-Id: Ieaf237248da8e075e56105cd08462d1aeb051ea2
Reviewed-on: https://review.typo3.org/47023
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
typo3/sysext/backend/Configuration/Backend/AjaxRoutes.php
typo3/sysext/backend/Resources/Public/JavaScript/LegacyTree.js
typo3/sysext/recordlist/Resources/Public/JavaScript/BrowseFiles.js
typo3/sysext/recordlist/Resources/Public/JavaScript/FileLinkHandler.js
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/AddImage.js

index ee491e8..7cd9dba 100644 (file)
@@ -152,12 +152,10 @@ class FileSystemNavigationFrameController
         $this->moduleTemplate->setBodyTag('<body id="ext-backend-Modules-FileSystemNavigationFrame-index-php">');
 
         // Adding javascript code for drag&drop and the filetree as well as the click menu code
-        $dragDropCode = '
-                       Tree.ajaxID = "sc_alt_file_navframe_expandtoggle";
-                       Tree.registerDragDropHandlers()';
+        $dragDropCode = '';
         if ($this->doHighlight) {
             $hlClass = $this->getBackendUser()->workspace === 0 ? 'active' : 'active active-ws wsver' . $GLOBALS['BE_USER']->workspace;
-            $dragDropCode .= '
+            $dragDropCode = '
                        Tree.highlightClass = "' . $hlClass . '";
                        Tree.highlightActiveItem("", top.fsMod.navFrameHighlightedID["file"]);
                        ';
@@ -168,6 +166,7 @@ class FileSystemNavigationFrameController
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/ClickMenu');
         $pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/LegacyTree', 'function() {
             DragDrop.table = "folders";
+                       Tree.registerDragDropHandlers();
             ' . $dragDropCode . '
         }');
 
index 4e620a7..d1300b8 100644 (file)
@@ -10,12 +10,6 @@ use TYPO3\CMS\Backend\Controller;
  */
 return [
 
-    // Expand or toggle in legacy database tree
-    'sc_alt_db_navframe_expandtoggle' => [
-        'path' => '/record/tree/expand',
-        'target' => Controller\PageTreeNavigationController::class . '::ajaxExpandCollapse'
-    ],
-
     // Expand or toggle in legacy file tree
     'sc_alt_file_navframe_expandtoggle' => [
         'path' => '/folder/tree/expand',
index 76c227b..7965708 100644 (file)
@@ -100,7 +100,7 @@ define(['jquery'], function($) {
        };
 
        Tree = {
-               ajaxID: 'sc_alt_db_navframe_expandtoggle',      // has to be either "sc_alt_db_navframe_expandtoggle" or "sc_alt_file_navframe_expandtoggle"
+               ajaxID: 'sc_alt_file_navframe_expandtoggle',
                frameSetModule: null,
                activateDragDrop: true,
                highlightClass: 'active',
index 71c1f06..e3da67d 100644 (file)
@@ -95,8 +95,6 @@ define(['jquery', 'TYPO3/CMS/Recordlist/ElementBrowser', 'TYPO3/CMS/Backend/Lega
                }
        };
 
-       Tree.ajaxID = 'sc_alt_file_navframe_expandtoggle';
-
        $(function() {
                $.extend(BrowseFiles.elements, $('body').data('elements'));
 
index 0575dc9..847c2a8 100644 (file)
@@ -47,8 +47,6 @@ define(['jquery', 'TYPO3/CMS/Recordlist/LinkBrowser', 'TYPO3/CMS/Backend/LegacyT
                LinkBrowser.finalizeFunction(FileLinkHandler.currentLink);
        };
 
-       Tree.ajaxID = 'sc_alt_file_navframe_expandtoggle';
-
        $(function() {
                FileLinkHandler.currentLink = $('body').data('currentLink');
 
index c295826..189909b 100644 (file)
@@ -53,8 +53,6 @@ define(['jquery', 'TYPO3/CMS/Rtehtmlarea/SelectImage', 'TYPO3/CMS/Backend/Legacy
                }
        };
 
-       Tree.ajaxID = 'sc_alt_file_navframe_expandtoggle';
-
        $(function () {
                $.extend(AddImage.elements, $('body').data('elements'));