Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging

2017-03-01 14:45:18 +01:00
parent eb9a39eb68 a2b5200381
commit b0323f6fd9
1 changed files with 3 additions and 1 deletions
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1489,9 +1489,11 @@ define([
            if (collapsable) {
                $collapse = $expandIcon.clone();
            }
-            var $element = $('<li>').append($collapse).append($icon).append($name).click(function (e) {
+            var $elementRow = $('<span>', {'class': 'element-row'}).append($collapse).append($icon).append($name).click(function (e) {
+                e.stopPropagation();
                module.displayDirectory(path);
            });
+            var $element = $('<li>').append($elementRow);
            if (draggable) { $element.attr('draggable', true); }
            if (collapsable) {
                $element.addClass('collapsed');