diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 15:00:04 -0400 |
| commit | 94ce8f2168bdd9897f54ec433ad7017fb3db1cc8 (patch) | |
| tree | db031ac7fd4788be6593e258d170c8f134533e4b /apps/files/js/fileactions.js | |
| parent | 269922543eaf9e69dbf5a15fa0ba34704040b09c (diff) | |
| parent | dfae77dec1650f171d09d4bde88ab74029f6e8c7 (diff) | |
| download | nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.tar.gz nextcloud-server-94ce8f2168bdd9897f54ec433ad7017fb3db1cc8.zip | |
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
Diffstat (limited to 'apps/files/js/fileactions.js')
| -rw-r--r-- | apps/files/js/fileactions.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index d54dd466469..39e848cec80 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -172,6 +172,7 @@ FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){r }else{ FileList.do_delete(filename); } + $('.tipsy').remove(); }); FileActions.register('all','Rename', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ |