diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-20 11:04:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-20 11:04:12 +0200 |
| commit | 5d9a9e8f3db178858894eadd961cf67993627ab0 (patch) | |
| tree | 61f04dc91226895fc63a90107953c3e80df57c49 /core | |
| parent | a59ad87db85c777465789f5afcf3f4753bc2fff5 (diff) | |
| parent | 9778094a25c46f4fe8dcf0afd6f9afd9be0ef915 (diff) | |
| download | nextcloud-server-5d9a9e8f3db178858894eadd961cf67993627ab0.tar.gz nextcloud-server-5d9a9e8f3db178858894eadd961cf67993627ab0.zip | |
Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner
fix filepicker loading spinner
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 3d68a591522..abefd2748b2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -1025,7 +1025,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin #oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;} #oc-dialog-filepicker-content .filelist { overflow-y:auto; - max-height: 300px; + height: 300px; background-color:white; width:100%; } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 67860c0c7a4..4448b813021 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -171,7 +171,6 @@ var OCdialogs = { $('body').append(self.$filePicker); - self.$filePicker.ready(function() { self.$filelist = self.$filePicker.find('.filelist'); self.$dirTree = self.$filePicker.find('.dirtree'); @@ -738,9 +737,10 @@ var OCdialogs = { var dirs = []; var others = []; var self = this; - this.$filelist.empty().addClass('loading'); + this.$filelist.empty().addClass('icon-loading'); this.$filePicker.data('path', dir); $.when(this._getFileList(dir, this.$filePicker.data('mimetype'))).then(function(response) { + $.each(response.data.files, function(index, file) { if (file.type === 'dir') { dirs.push(file); @@ -772,7 +772,7 @@ var OCdialogs = { self.$filelist.append($li); }); - self.$filelist.removeClass('loading'); + self.$filelist.removeClass('icon-loading'); if (!OC.Util.hasSVGSupport()) { OC.Util.replaceSVG(self.$filePicker.find('.dirtree')); } |