From fa28c089fa3ffb72e97ca0f89cbfade3d0a8a8a5 Mon Sep 17 00:00:00 2001 From: Oskar Hollmann Date: Wed, 19 Mar 2014 22:09:09 +0100 Subject: [PATCH 1/2] Fix: 'Upload button tooltip doesn't disappear' Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM. --- apps/files/js/file-upload.js | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 apps/files/js/file-upload.js diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js old mode 100644 new mode 100755 index ea4061c9b0..c668bbf397 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -320,6 +320,7 @@ OC.Upload = { */ start: function(e) { OC.Upload.log('start', e, null); + $('#upload').tipsy('hide'); // otherwise "Upload max." covers progress bar }, submit: function(e, data) { OC.Upload.rememberUpload(data); From 90839b784f748b18a2a5fae4cc3f80bd1df7b355 Mon Sep 17 00:00:00 2001 From: Oskar Hollmann Date: Wed, 19 Mar 2014 23:05:03 +0100 Subject: [PATCH 2/2] Comment moved to prevent 'Line is too long' warning. --- apps/files/js/file-upload.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index c668bbf397..371c83e742 100755 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -320,7 +320,8 @@ OC.Upload = { */ start: function(e) { OC.Upload.log('start', e, null); - $('#upload').tipsy('hide'); // otherwise "Upload max." covers progress bar + //hide the tooltip otherwise it covers the progress bar + $('#upload').tipsy('hide'); }, submit: function(e, data) { OC.Upload.rememberUpload(data);