diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-11 22:54:39 +0200 |
| commit | fb2d2bc2011c371ff1e4334f84494f15a84a07a2 (patch) | |
| tree | b5c20c842441ce4288038909daa5a158c8e74e80 /apps/files_versions/js | |
| parent | 5c6e9518edde10e0c23d0d734d2cc6d161fc15c0 (diff) | |
| parent | ee28e35ba93032a3d43601c030d3d44df9b092f0 (diff) | |
| download | nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.tar.gz nextcloud-server-fb2d2bc2011c371ff1e4334f84494f15a84a07a2.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_versions/js')
| -rw-r--r-- | apps/files_versions/js/versions.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index aa79cffeca4..87396cd0ba1 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -21,11 +21,11 @@ $(document).ready(function(){ } ,function(filename){ // Action to perform when clicked - if (scanFiles.scanning || !$('#dropdown').hasClass('drop-versions')){return;}//workaround to prevent additional http request block scanning feedback + if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback var file = $('#dir').val()+'/'+filename; // Check if drop down is already visible for a different file - if (($('#dropdown').length > 0)) { + if (($('#dropdown').length > 0) && $('#dropdown').hasClass('drop-versions') ) { if (file != $('#dropdown').data('file')) { $('#dropdown').hide('blind', function() { $('#dropdown').remove(); |