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

2017-03-02 17:09:39 +01:00
parent e8a82c4c10 2b6e44189d
commit e39fe1c0b7
9 changed files with 161 additions and 9 deletions
--- a/www/drive/file.css
+++ b/www/drive/file.css
@@ -113,6 +113,7 @@ span.fa-folder-open {
 #tree li > span.element-row {
  width: 100%;
  display: inline-block;
+  cursor: pointer;
 }
 #tree li > span.element-row:not(.selected):hover {
  background-color: #eee;
--- a/www/drive/file.less
+++ b/www/drive/file.less
@@ -147,6 +147,7 @@ span {
        & > span.element-row {
            width: 100%;
            display: inline-block;
+            cursor: pointer;
        }
        & > span.element-row:not(.selected):hover {
            background-color: @drive-hover;
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -1164,7 +1164,7 @@ define([
                    var e = useData ? element : filesOp.getFileData(element);
                    if (!e) {
                        e = {
-                            href : el,
+                            href : element,
                            title : Messages.fm_noname,
                            atime : 0,
                            ctime : 0