infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'search2' into staging

Browse Source
pull/1/head
ansuz 5 years ago
parent 89aae79531 c3a9503809
commit 3779e63a34
4 changed files with 109 additions and 87 deletions
Show Stats Download Patch File Download Diff File

11
customize.dist/src/less2/include/alertify.less
Unescape Escape View File

@ -227,16 +227,7 @@
} }
} }
::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */ .tools_placeholder-color(@cryptpad_color_grey);
color: @cryptpad_color_grey;
opacity: 1; /* Firefox */
}
:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: @cryptpad_color_grey;
}
::-ms-input-placeholder { /* Microsoft Edge */
color: @cryptpad_color_grey;
}
span.cp-password-container { span.cp-password-container {
display: flex; display: flex;

18
customize.dist/src/less2/include/drive.less
Unescape Escape View File

@ -222,7 +222,7 @@
#cp-app-drive-search { #cp-app-drive-search {
display: flex; display: inline-flex;
align-items: center; align-items: center;
max-width: 400px; max-width: 400px;
font-size: 30px; font-size: 30px;
@ -230,7 +230,7 @@
input { input {
background: transparent; background: transparent;
color: @colortheme_drive-color; color: @colortheme_drive-color;
.tools_placeholder-color(@colortheme_drive-color); .tools_placeholder-color(@cryptpad_color_grey);
outline-width: 0px; outline-width: 0px;
border-radius: 0; border-radius: 0;
width: 100%; width: 100%;
@ -256,7 +256,19 @@
color: @colortheme_drive-color; color: @colortheme_drive-color;
} }
} }
.cp-app-drive-search-spinner {
display: inline-flex;
color: @colortheme_drive-color;
font-size: 40px;
align-items: center;
justify-content: center;
}
.cp-app-drive-search-noresult {
font-size: 30px;
padding: 15px;
font-style: italic;
color: @cryptpad_color_grey;
}
/* TREE */ /* TREE */

8
customize.dist/src/less2/include/tools.less
Unescape Escape View File

@ -2,13 +2,9 @@
&::-webkit-input-placeholder { /* WebKit, Blink, Edge */ &::-webkit-input-placeholder { /* WebKit, Blink, Edge */
color: @color;; color: @color;;
} }
&:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ &::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
color: @color; color: @color;
opacity: 1; opacity: 1; /* Firefox */
}
&::-moz-placeholder { /* Mozilla Firefox 19+ */
color: @color;
opacity: 1;
} }
&:-ms-input-placeholder { /* Internet Explorer 10-11 */ &:-ms-input-placeholder { /* Internet Explorer 10-11 */
color: @color; color: @color;

159
www/common/drive-ui.js
Unescape Escape View File

@ -234,9 +234,9 @@ define([
return LS; return LS;
}; };
var getViewModeClass = function () { var getViewModeClass = function (forceList) {
var mode = APP.store[LS_VIEWMODE]; var mode = APP.store[LS_VIEWMODE];
if (mode === 'list') { return 'cp-app-drive-content-list'; } if (mode === 'list' || forceList) { return 'cp-app-drive-content-list'; }
return 'cp-app-drive-content-grid'; return 'cp-app-drive-content-grid';
}; };
var getViewMode = function () { var getViewMode = function () {
@ -3234,18 +3234,26 @@ define([
$searchIcon.clone().appendTo($div); $searchIcon.clone().appendTo($div);
var $spinnerContainer = $(h('div.cp-app-drive-search-spinner'));
var spinner = UI.makeSpinner($spinnerContainer);
var $input = APP.Search.$input = $('<input>', { var $input = APP.Search.$input = $('<input>', {
id: 'cp-app-drive-search-input', id: 'cp-app-drive-search-input',
placeholder: Messages.fm_searchName,
type: 'text', type: 'text',
draggable: false, draggable: false,
tabindex: 1, tabindex: 1,
}).keyup(function (e) { }).keyup(function (e) {
var lastValue = search.value;
search.value = $input.val().trim();
if (lastValue === search.value) { return; }
if (search.to) { window.clearTimeout(search.to); } if (search.to) { window.clearTimeout(search.to); }
if ($input.val().trim() === "") { if (search.value === "") {
search.cursor = 0; search.cursor = 0;
APP.displayDirectory([SEARCH]); APP.displayDirectory([SEARCH]);
return; return;
} }
spinner.spin();
if (e.which === 13) { if (e.which === 13) {
var newLocation = [SEARCH, $input.val()]; var newLocation = [SEARCH, $input.val()];
search.cursor = $input[0].selectionStart; search.cursor = $input[0].selectionStart;
@ -3290,73 +3298,89 @@ define([
$div.append(cancel); $div.append(cancel);
$list.append($div); $list.append($div);
$spinnerContainer.appendTo($list);
setTimeout(function () { setTimeout(function () {
$input.focus(); $input.focus();
}); });
$list.closest('#cp-app-drive-content-folder').addClass('cp-app-drive-content-list'); if (typeof(value) === "string" && value.trim()) {
var filesList = manager.search(value); spinner.spin();
var sortable = {}; } else {
var sortableFolders = []; return;
filesList.forEach(function (r) { }
// if r.id === null, then it's a folder, not a file
r.paths.forEach(function (path) { setTimeout(function () {
if (!r.inSharedFolder && //$list.closest('#cp-app-drive-content-folder').addClass('cp-app-drive-content-list');
APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) { return; } var filesList = manager.search(value);
var _path = path.slice(); if (!filesList.length) {
var key = path.pop(); Messages.fm_noResult = "No result found"; // XXX
var root = manager.find(path); $list.append(h('div.cp-app-drive-search-noresult', Messages.fm_noResult));
var obj = { spinner.hide();
path: path, return;
_path: _path,
key: key,
root: root,
data: r.data
};
if (manager.isFolder(root[key])) {
sortableFolders.push(obj);
return;
}
sortable[root[key]] = obj;
});
});
var _folders = sortElements(true, [ROOT], sortableFolders, null, !getSortFolderDesc(), true);
var sortableKeys = Object.keys(sortable).map(Number);
var _files = sortElements(false, [ROOT], sortableKeys, APP.store[SORT_FILE_BY], !getSortFileDesc(), true);
var addEl = function (obj, folder) {
var $element = createElement(obj.path, obj.key, obj.root, folder);
$element.addClass('cp-app-drive-element-notrash cp-app-drive-search-result');
$element.off('contextmenu');
$element.contextmenu(openContextMenu('default'));
$element.data('context', 'default');
if (folder) {
$element.find('.cp-app-drive-element-list').css({
visibility: 'hidden'
}).text('');
}
if (manager.isPathIn(obj._path, ['hrefArray'])) {
obj._path.pop();
obj._path.push(obj.data.title);
} }
var $path = $('<span>', { var sortable = {};
'class': 'cp-app-drive-search-path' var sortableFolders = [];
}).appendTo($element.find('.cp-app-drive-element-name')); filesList.forEach(function (r) {
createTitle($path, obj._path); // if r.id === null, then it's a folder, not a file
r.paths.forEach(function (path) {
if (!r.inSharedFolder &&
APP.hideDuplicateOwned && manager.isDuplicateOwned(path)) { return; }
var _path = path.slice();
var key = path.pop();
var root = manager.find(path);
var obj = {
path: path,
_path: _path,
key: key,
root: root,
data: r.data
};
if (manager.isFolder(root[key])) {
sortableFolders.push(obj);
return;
}
sortable[root[key]] = obj;
});
});
var _folders = sortElements(true, [ROOT], sortableFolders, null, !getSortFolderDesc(), true);
var sortableKeys = Object.keys(sortable).map(Number);
var _files = sortElements(false, [ROOT], sortableKeys, APP.store[SORT_FILE_BY], !getSortFileDesc(), true);
var addEl = function (obj, folder) {
var $element = createElement(obj.path, obj.key, obj.root, folder);
$element.addClass('cp-app-drive-element-notrash cp-app-drive-search-result');
$element.off('contextmenu');
$element.contextmenu(openContextMenu('default'));
$element.data('context', 'default');
if (folder) {
$element.find('.cp-app-drive-element-list').css({
visibility: 'hidden'
}).text('');
}
if (manager.isPathIn(obj._path, ['hrefArray'])) {
obj._path.pop();
obj._path.push(obj.data.title);
}
var $path = $('<span>', {
'class': 'cp-app-drive-search-path'
}).appendTo($element.find('.cp-app-drive-element-name'));
createTitle($path, obj._path);
$list.append($element); $list.append($element);
}; };
if (_folders.length) { getFolderListHeader(true, true).appendTo($list); } if (_folders.length) { getFolderListHeader(true, true).appendTo($list); }
_folders.forEach(function (el) { _folders.forEach(function (el) {
var obj = el; var obj = el;
addEl(obj, true); addEl(obj, true);
}); });
if (_files.length) { getFileListHeader(true).appendTo($list); } if (_files.length) { getFileListHeader(true).appendTo($list); }
_files.forEach(function (el) { _files.forEach(function (el) {
var obj = sortable[el]; var obj = sortable[el];
addEl(obj, false); addEl(obj, false);
});
setTimeout(collapseDrivePath);
spinner.hide();
}); });
setTimeout(collapseDrivePath);
}; };
var displayRecent = function ($list) { var displayRecent = function ($list) {
@ -3612,12 +3636,11 @@ define([
var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID}); var $dirContent = $('<div>', {id: FOLDER_CONTENT_ID});
$dirContent.data('path', path); $dirContent.data('path', path);
if (!isSearch && !isTags) { if (!isTags) {
var mode = getViewMode(); $dirContent.addClass(getViewModeClass(isSearch));
if (mode) { if (!isSearch) {
$dirContent.addClass(getViewModeClass()); createViewModeButton(APP.toolbar.$bottomR);
} }
createViewModeButton(APP.toolbar.$bottomR);
} }
var $list = $('<ul>').appendTo($dirContent); var $list = $('<ul>').appendTo($dirContent);

Write Preview
Loading…
Cancel
Save