Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-03-20 16:25:21 +0400
committerMorris Jobke <morris.jobke@gmail.com>2014-03-20 16:25:21 +0400
commit95a13e2690c9bc7d45446fb64207e090f7cc8368 (patch)
treeab988f68f504bb92c6170b5748f7e2a07eeae647 /apps
parent36c0f08ec0c5327f9b38f1078ee0d6ef8823b8da (diff)
parent90839b784f748b18a2a5fae4cc3f80bd1df7b355 (diff)
Merge pull request #7814 from oskholl/master
Fix: 'Upload button tooltip doesn't disappear'
Diffstat (limited to 'apps')
-rwxr-xr-x[-rw-r--r--]apps/files/js/file-upload.js2
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..100755
--- 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);