Correctly render uploadtext indicator only on folders

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 7e1329d1155336951c5a1f01b6c08f0ccf057ad1..ec82117c2b36153f2d8431c01f2fc026b124f503 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1068,7 +1068,7 @@
                                nameSpan.tooltip({placement: 'right'});
                        }
                        // dirs can show the number of uploaded files
-                       if (mime !== 'httpd/unix-directory') {
+                       if (mime === 'httpd/unix-directory') {
                                linkElem.append($('<span></span>').attr({
                                        'class': 'uploadtext',
                                        'currentUploads': 0

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 3542a5cee8f999cee76fa6c3c938d3e655e99a41..9dfcdfead7fe9eab3fc930b5c475a8154adde275 100644 (file)
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -2402,6 +2402,21 @@ describe('OCA.Files.FileList tests', function() {
                                expect(ev.result).not.toEqual(false);
                                expect(uploadData.targetDir).toEqual('/a/b');
                        });
+                       it('renders upload indicator element for folders only', function() {
+                               fileList.add({
+                                       name: 'afolder',
+                                       type: 'dir',
+                                       mime: 'httpd/unix-directory'
+                               });
+                               fileList.add({
+                                       name: 'afile.txt',
+                                       type: 'file',
+                                       mime: 'text/plain'
+                               });
+
+                               expect(fileList.findFileEl('afolder').find('.uploadtext').length).toEqual(1);
+                               expect(fileList.findFileEl('afile.txt').find('.uploadtext').length).toEqual(0);
+                       });
                });
        });
        describe('Handling errors', function () {