miklo
/
TiddlyWiki5
kopia lustrzana https://github.com/miklobit/TiddlyWiki5
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix crash with search operator with blank field list

logging-improvements
Jermolene 2018-11-01 12:56:56 +00:00
rodzic dff5315afe
commit b584295831
2 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
core/modules/filters/search.js
Wyświetl plik

@ -22,16 +22,18 @@ exports.search = function(source,operator,options) {
return (operator.suffixes[1] || []).indexOf(flag) !== -1;
},
excludeFields = false,
firstChar = operator.suffixes[0][0].charAt(0),
fieldList = operator.suffixes[0] || [],
firstField = fieldList[0] || "",
firstChar = firstField.charAt(0),
fields;
if(operator.suffixes[0][0].charAt(0) === "-") {
fields = [operator.suffixes[0][0].slice(1)].concat(operator.suffixes[0].slice(1));
if(firstChar === "-") {
fields = [firstField.slice(1)].concat(fieldList.slice(1));
excludeFields = true;
} else if(operator.suffixes[0][0] === "*"){
} else if(fieldList[0] === "*"){
fields = [];
excludeFields = true;
} else {
fields = operator.suffixes[0].slice(0);
fields = fieldList.slice(0);
}
return options.wiki.search(operator.operand,{
source: source,

4
core/modules/wiki.js
Wyświetl plik

@ -1100,7 +1100,9 @@ exports.search = function(text,options) {
if(options.field) {
if($tw.utils.isArray(options.field)) {
$tw.utils.each(options.field,function(fieldName) {
fields.push(fieldName);
if(fieldName) {
fields.push(fieldName);
}
});
} else {
fields.push(options.field);