aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/lib/Controller/ViewController.php
diff options
context:
space:
mode:
authorfnuesse <felix.nuesse@t-online.de>2018-06-27 10:40:32 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-07-12 16:49:39 +0200
commitc9995de2db2072960144163d62e2507e393d32b6 (patch)
treefda20d08557ae40604a799e45de35ddbcb313d0e /apps/files/lib/Controller/ViewController.php
parent55ebdc9344dc8edb665491bf89595f406cfc4d62 (diff)
downloadnextcloud-server-c9995de2db2072960144163d62e2507e393d32b6.tar.gz
nextcloud-server-c9995de2db2072960144163d62e2507e393d32b6.zip
Added drop-animation to sortable-list
Signed-off-by: fnuesse <felix.nuesse@t-online.de> Added icon-change on drag Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed Navbar-closing in app when favorites-list is toggled on mobile Signed-off-by: fnuesse <felix.nuesse@t-online.de> Refactored Code Signed-off-by: fnuesse <felix.nuesse@t-online.de> Changed to alphabetical sorting Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed deletion of folder with identical names Signed-off-by: fnuesse <felix.nuesse@t-online.de> Removed ability to add files to the quickaccess Signed-off-by: fnuesse <felix.nuesse@t-online.de> Fixed wrong path-generation when added from favorites-star Signed-off-by: fnuesse <felix.nuesse@t-online.de> Removed Element from navbar when favorite-star in detailview is toggled off Signed-off-by: fnuesse <felix.nuesse@t-online.de> Changed Quota-Text to prevent boundarybreaks Reverted last commit
Diffstat (limited to 'apps/files/lib/Controller/ViewController.php')
-rw-r--r--apps/files/lib/Controller/ViewController.php9
1 files changed, 8 insertions, 1 deletions
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,
]