web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix small UI issues in drive

Browse Source
This commit is contained in:
yflory 2018-07-20 12:29:18 +02:00
parent bad1d7311a
commit 4325ed4dde
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/sframe-common-outer.js
View File

@ -432,7 +432,6 @@ define([
var validate = nSecret.keys.validateKey; var validate = nSecret.keys.validateKey;
var crypto = Crypto.createEncryptor(nSecret.keys); var crypto = Crypto.createEncryptor(nSecret.keys);
Cryptpad.getHistoryRange({ Cryptpad.getHistoryRange({
drive: cfg.isDrive,
channel: channel, channel: channel,
validateKey: validate, validateKey: validate,
lastKnownHash: data.lastKnownHash lastKnownHash: data.lastKnownHash

2
www/common/userObject.js
View File

@ -260,7 +260,7 @@ define([
var root = files[TRASH]; var root = files[TRASH];
var ret = []; var ret = [];
var addFiles = function (el) { var addFiles = function (el) {
if (isFile(el.element)) { if (isFile(el.element) || isSharedFolder(el.element)) {
if(ret.indexOf(el.element) === -1) { ret.push(el.element); } if(ret.indexOf(el.element) === -1) { ret.push(el.element); }
} else { } else {
getFilesRecursively(el.element, ret); getFilesRecursively(el.element, ret);

6
www/drive/app-drive.less
View File

@ -833,7 +833,6 @@
} }
.cp-app-drive-path { .cp-app-drive-path {
flex: 1;
width: 100%; width: 100%;
height: @variables_bar-height; height: @variables_bar-height;
line-height: @variables_bar-height; line-height: @variables_bar-height;
@ -843,7 +842,6 @@
white-space: nowrap; white-space: nowrap;
display: flex; display: flex;
flex-flow: row-reverse; flex-flow: row-reverse;
justify-content: right;
max-width: 100%; max-width: 100%;
text-align: left; text-align: left;
.cp-app-drive-path-element { .cp-app-drive-path-element {
@ -868,6 +866,10 @@
} }
} }
} }
.cp-app-drive-toolbar-filler {
flex: 1;
}
} }
} }

5
www/drive/inner.js
View File

@ -1567,8 +1567,8 @@ define([
var name = p; var name = p;
var currentEl = manager.find(path.slice(0, idx+1)); var currentEl = isVirtual ? undefined : manager.find(path.slice(0, idx+1));
if (manager.isSharedFolder(currentEl)) { if (currentEl && manager.isSharedFolder(currentEl)) {
name = manager.getSharedFolderData(currentEl).title; name = manager.getSharedFolderData(currentEl).title;
skipNext = true; skipNext = true;
} }
@ -2162,6 +2162,7 @@ define([
$toolbar.html(''); $toolbar.html('');
$('<div>', {'class': 'cp-app-drive-toolbar-leftside'}).appendTo($toolbar); $('<div>', {'class': 'cp-app-drive-toolbar-leftside'}).appendTo($toolbar);
$('<div>', {'class': 'cp-app-drive-path cp-unselectable'}).appendTo($toolbar); $('<div>', {'class': 'cp-app-drive-path cp-unselectable'}).appendTo($toolbar);
$('<div>', {'class': 'cp-app-drive-toolbar-filler'}).appendTo($toolbar);
var $rightside = $('<div>', {'class': 'cp-app-drive-toolbar-rightside'}) var $rightside = $('<div>', {'class': 'cp-app-drive-toolbar-rightside'})
.appendTo($toolbar); .appendTo($toolbar);
var $hist = common.createButton('history', true, {histConfig: APP.histConfig}); var $hist = common.createButton('history', true, {histConfig: APP.histConfig});