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

Merge branch 'staging' into slide2

Browse Source
This commit is contained in:
yflory
2017-09-08 18:21:38 +02:00
parent 514bff7065 0ed6846e07
commit 5bf966633c
6 changed files with 134 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/filepicker/inner.js
View File

@@ -90,7 +90,7 @@ define([
// Description
var text = Messages.filePicker_description;
if (types.length === 1 && types[0] !== 'file') {
if (types && types.length === 1 && types[0] !== 'file') {
// Should be Templates
text = Messages.selectTemplate;
}
@@ -117,7 +117,8 @@ define([
// Update the files list when needed
updateContainer = function () {
$container.html('');
var filter = $filter.find('.cp-filepicker-filter').val().trim();
var $input = $filter.find('.cp-filepicker-filter');
var filter = $input.val().trim();
var todo = function (err, list) {
if (err) { return void console.error(err); }
Object.keys(list).forEach(function (id) {
@@ -136,6 +137,7 @@ define([
if (typeof onSelect === "function") { onSelect(data.href); }
});
});
$input.focus();
};
common.getFilesList(filters, todo);
};