diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-26 00:14:21 +0200 |
| commit | de135e3b9bdcb58358b872003fd1e98f51554912 (patch) | |
| tree | c16b0beeb84a6835ff0ebce5d1be1a4d789e8a25 /files/js/filelist.js | |
| parent | 9d91e53027e0a0c64f36a7eb5812dbe70c6dfaa7 (diff) | |
| parent | 965a8ba2c60eb04e2f65a4ace215113ac61f7c98 (diff) | |
| download | nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.tar.gz nextcloud-server-de135e3b9bdcb58358b872003fd1e98f51554912.zip | |
resolve merge conflicts
Diffstat (limited to 'files/js/filelist.js')
| -rw-r--r-- | files/js/filelist.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/files/js/filelist.js b/files/js/filelist.js index 5bd85fc29ef..febdfc473b1 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -43,6 +43,7 @@ FileList={ td.append('<input type="checkbox" />'); var link_elem = $('<a></a>').attr({ "class": "name", "href": "index.php?dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') }); link_elem.append($('<span></span>').addClass('nametext').text(name)); + link_elem.append($('<span></span>').attr({'class': 'uploadtext', 'currentUploads': 0})); td.append(link_elem); html.append(td); if(size!='Pending'){ |