diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-11-16 14:50:40 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-11-16 14:50:40 +0100 |
| commit | 5e5cced48cc912f3dcd71013483f62dbb56d7362 (patch) | |
| tree | 8bea8a968ce9739f89d3bccd429d898d6b6f1f74 /core | |
| parent | 916cdb260ef5fd35cb671468a93044d8decb2ee3 (diff) | |
| download | nextcloud-server-5e5cced48cc912f3dcd71013483f62dbb56d7362.tar.gz nextcloud-server-5e5cced48cc912f3dcd71013483f62dbb56d7362.zip | |
Properly align loading indicator when switching folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.scss | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/core/css/styles.scss b/core/css/styles.scss index 62d2bb45c96..da270893e66 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -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; } } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 49bf626ed82..3169dab4b88 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -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'); }); }, /** |