From c9995de2db2072960144163d62e2507e393d32b6 Mon Sep 17 00:00:00 2001 From: fnuesse Date: Wed, 27 Jun 2018 10:40:32 +0200 Subject: Added drop-animation to sortable-list Signed-off-by: fnuesse Added icon-change on drag Signed-off-by: fnuesse Fixed Navbar-closing in app when favorites-list is toggled on mobile Signed-off-by: fnuesse Refactored Code Signed-off-by: fnuesse Changed to alphabetical sorting Signed-off-by: fnuesse Fixed deletion of folder with identical names Signed-off-by: fnuesse Removed ability to add files to the quickaccess Signed-off-by: fnuesse Fixed wrong path-generation when added from favorites-star Signed-off-by: fnuesse Removed Element from navbar when favorite-star in detailview is toggled off Signed-off-by: fnuesse Changed Quota-Text to prevent boundarybreaks Reverted last commit --- apps/files/lib/Controller/ViewController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'apps/files/lib/Controller/ViewController.php') diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 82f9ea000af..13b33b96cc8 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -207,6 +207,13 @@ class ViewController extends Controller { $defaultExpandedState = 'false'; } + $quickAccessDraggable = 'false'; + //See Javascript navigation.js for possible sorting strategies + if($this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'quickaccess_sorting_strategy', 'alphabet')=='customorder'){ + $quickAccessDraggable = 'true'; + } + + \OCA\Files\App::getNavigationManager()->add( [ 'id' => 'favorites', @@ -216,7 +223,7 @@ class ViewController extends Controller { 'order' => 5, 'name' => $this->l10n->t('Favorites'), 'sublist' => $favoritesSublistArray, - 'draggableSublist' => 'true', + 'draggableSublist' => $quickAccessDraggable, 'defaultExpandedState' => $defaultExpandedState, 'enableMenuButton' => 0, ] -- cgit v1.2.3