Skip to content

Commit 052221a

Browse files
authored
Merge pull request #10176 from nextcloud/newhinton/master
Add Quick-Access to favorite folder in left sidepanel in files-app #9720
2 parents 09d5b61 + 49a701e commit 052221a

11 files changed

Lines changed: 781 additions & 119 deletions

File tree

apps/files/appinfo/routes.php

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,66 @@
7676
'url' => '/ajax/getstoragestats.php',
7777
'verb' => 'GET',
7878
],
79+
[
80+
'name' => 'API#showQuickAccess',
81+
'url' => '/api/v1/quickaccess/set/showList',
82+
'verb' => 'GET',
83+
],
84+
[
85+
'name' => 'API#getShowQuickAccess',
86+
'url' => '/api/v1/quickaccess/get/showList',
87+
'verb' => 'GET',
88+
],
89+
[
90+
'name' => 'API#getShowQuickaccessSettings',
91+
'url' => '/api/v1/quickaccess/showsettings',
92+
'verb' => 'GET',
93+
],
94+
[
95+
'name' => 'API#setShowQuickaccessSettings',
96+
'url' => '/api/v1/quickaccess/set/showsettings',
97+
'verb' => 'GET',
98+
],
99+
[
100+
'name' => 'API#setSortingStrategy',
101+
'url' => '/api/v1/quickaccess/set/SortingStrategy',
102+
'verb' => 'GET',
103+
],
104+
[
105+
'name' => 'API#setReverseQuickaccess',
106+
'url' => '/api/v1/quickaccess/set/ReverseList',
107+
'verb' => 'GET',
108+
],
109+
[
110+
'name' => 'API#getSortingStrategy',
111+
'url' => '/api/v1/quickaccess/get/SortingStrategy',
112+
'verb' => 'GET',
113+
],
114+
[
115+
'name' => 'API#getReverseQuickaccess',
116+
'url' => '/api/v1/quickaccess/get/ReverseList',
117+
'verb' => 'GET',
118+
],
119+
[
120+
'name' => 'API#getFavoritesFolder',
121+
'url' => '/api/v1/quickaccess/get/FavoriteFolders/',
122+
'verb' => 'GET'
123+
],
124+
[
125+
'name' => 'API#setSortingOrder',
126+
'url' => '/api/v1/quickaccess/set/CustomSortingOrder',
127+
'verb' => 'GET',
128+
],
129+
[
130+
'name' => 'API#getSortingOrder',
131+
'url' => '/api/v1/quickaccess/get/CustomSortingOrder',
132+
'verb' => 'GET',
133+
],
134+
[
135+
'name' => 'API#getNodeType',
136+
'url' => '/api/v1/quickaccess/get/NodeType',
137+
'verb' => 'GET',
138+
],
79139
]
80140
]
81141
);

apps/files/js/app.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353
this.$showHiddenFiles = $('input#showhiddenfilesToggle');
5454
var showHidden = $('#showHiddenFiles').val() === "1";
5555
this.$showHiddenFiles.prop('checked', showHidden);
56+
57+
5658
if ($('#fileNotFound').val() === "1") {
5759
OC.Notification.show(t('files', 'File could not be found'), {type: 'error'});
5860
}
@@ -219,7 +221,7 @@
219221
},
220222

221223
/**
222-
* Persist show hidden preference on ther server
224+
* Persist show hidden preference on the server
223225
*
224226
* @returns {undefined}
225227
*/
@@ -237,8 +239,8 @@
237239
var params;
238240
if (e && e.itemId) {
239241
params = {
240-
view: e.itemId,
241-
dir: '/'
242+
view: typeof e.view === 'string' && e.view !== '' ? e.view : e.itemId,
243+
dir: e.dir ? e.dir : '/'
242244
};
243245
this._changeUrl(params.view, params.dir);
244246
OC.Apps.hideAppSidebar($('.detailsView'));

0 commit comments

Comments
 (0)