sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly align loading indicator when switching folders 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/12350/head
Julius Härtl 2018-11-16 14:50:40 +07:00
parent 916cdb260e
commit 5e5cced48c
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/css/styles.scss
Unescape Escape View File

@ -778,7 +778,7 @@ code {
border-bottom: 1px solid var(--color-border);
background-color: var(--color-main-background);
th {
width: auto;
width: 80%;
border: none;
}
}

9
core/js/oc-dialogs.js
Unescape Escape View File

@ -257,6 +257,7 @@ var OCdialogs = {
self.$filePicker.ready(function() {
self.$fileListHeader = self.$filePicker.find('.filelist thead tr');
self.$filelist = self.$filePicker.find('.filelist tbody');
self.$filelistContainer = self.$filePicker.find('.filelist-container');
self.$dirTree = self.$filePicker.find('.dirtree');
self.$dirTree.on('click', 'div:not(:last-child)', self, function (event) {
self._handleTreeListSelect(event, type);
@ -896,7 +897,9 @@ var OCdialogs = {
*/
_fillFilePicker:function(dir) {
var self = this;
this.$filelist.empty().addClass('icon-loading');
this.$filelist.empty();
this.$filePicker.find('.emptycontent').hide();
this.$filelistContainer.addClass('icon-loading');
this.$filePicker.data('path', dir);
var filter = this.$filePicker.data('mimetype');
if (typeof(filter) === "string") {
@ -952,8 +955,10 @@ var OCdialogs = {
if (files.length === 0) {
self.$filePicker.find('.emptycontent').show();
self.$fileListHeader.hide();
} else {
self.$filePicker.find('.emptycontent').hide();
self.$fileListHeader.show();
}
$.each(files, function(idx, entry) {
@ -993,7 +998,7 @@ var OCdialogs = {
self.$filelist.append($row);
});
self.$filelist.removeClass('icon-loading');
self.$filelistContainer.removeClass('icon-loading');
});
},
/**