diff options
| author | kondou <kondou@ts.unde.re> | 2014-03-21 20:23:31 +0100 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2014-03-21 20:23:31 +0100 |
| commit | dda7129a243c7ebdbcdf9c2b5dbf167542402bc2 (patch) | |
| tree | d03dff6783ebabb6273a19ed59a6b9b3731e923e /apps/files/js/file-upload.js | |
| parent | 556c6eca2397eaa03c4503822d647c8b6cb5e70e (diff) | |
| parent | 4be0b3f6cce540282c6745d6bf3d2a0fa4ac65b4 (diff) | |
| download | nextcloud-server-dda7129a243c7ebdbcdf9c2b5dbf167542402bc2.tar.gz nextcloud-server-dda7129a243c7ebdbcdf9c2b5dbf167542402bc2.zip | |
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index ea4061c9b0b..371c83e742c 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -320,6 +320,8 @@ OC.Upload = { */ start: function(e) { OC.Upload.log('start', e, null); + //hide the tooltip otherwise it covers the progress bar + $('#upload').tipsy('hide'); }, submit: function(e, data) { OC.Upload.rememberUpload(data); |