]> source.dussan.org Git - nextcloud-server.git/commitdiff
Prevent Versions click handler from closing sharing dropdown
authorVicDeo <victor.dubiniuk@gmail.com>
Tue, 9 Oct 2012 10:00:04 +0000 (13:00 +0300)
committerVicDeo <victor.dubiniuk@gmail.com>
Tue, 9 Oct 2012 10:00:33 +0000 (13:00 +0300)
apps/files_versions/js/versions.js

index 9075095d286142126cb75437cef969bdb74ccb02..aa79cffeca4b34013357cdc56c95795f7c299467 100644 (file)
@@ -21,7 +21,7 @@ $(document).ready(function(){
                        }
                        ,function(filename){
                                // Action to perform when clicked
-                               if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
+                               if (scanFiles.scanning || !$('#dropdown').hasClass('drop-versions')){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
@@ -45,7 +45,7 @@ function createVersionsDropdown(filename, files) {
 
        var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
 
-       var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
+       var html = '<div id="dropdown" class="drop drop-versions" data-file="'+files+'">';
        html += '<div id="private">';
        html += '<select data-placeholder="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">';
        html += '<option value=""></option>';
@@ -137,8 +137,7 @@ function createVersionsDropdown(filename, files) {
 
 $(this).click(
        function(event) {
-       
-       if ($('#dropdown').has(event.target).length === 0) {
+       if ($('#dropdown').has(event.target).length === 0 && $('#dropdown').hasClass('drop-versions')) {
                $('#dropdown').hide('blind', function() {
                        $('#dropdown').remove();
                        $('tr').removeClass('mouseOver');