mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-08-07 22:33:50 +00:00
Code Issues Releases Wiki Activity

Fix whitespace in x-listops.js and tweak toggle operator (#5024)

Browse Source 
* Replaced leading spaces with tabs

* Tweak toggle[] to insert new value in same list position
This commit is contained in:
saqimtiaz 2020-11-15 17:04:03 +01:00 committed by GitHub
parent a2b2e117e3
commit 13499557bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 174 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/modules/filters/x-listops.js
View File

@ -196,14 +196,16 @@ Extended filter operators to manipulate the current list.
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
pairIndex = (operator.operands[1] ? results.indexOf(operator.operands[1]) : -1); pairIndex = (operator.operands[1] ? results.indexOf(operator.operands[1]) : -1);
if(index === -1) { if(index === -1) {
results.push(operator.operand);
if(pairIndex !== -1) { if(pairIndex !== -1) {
results.splice(pairIndex,1); results.splice(pairIndex,1,operator.operand);
} else {
results.push(operator.operand);
} }
} else { } else {
results.splice(index,1);
if(operator.operands[1]) { if(operator.operands[1]) {
results.push(operator.operands[1]); results.splice(index,1,operator.operands[1]);
} else {
results.splice(index,1);
} }
} }
return results; return results;

1
editions/test/tiddlers/tests/test-filters.js
View File

@ -758,6 +758,7 @@ function runTests(wiki) {
expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] -[[one]] +[toggle[one]]").join(",")).toBe("two,one"); expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] -[[one]] +[toggle[one]]").join(",")).toBe("two,one");
expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] +[toggle[three],[four]]").join(",")).toBe("one,two,three"); expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] +[toggle[three],[four]]").join(",")).toBe("one,two,three");
expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] [[three]] +[toggle[three],[four]]").join(",")).toBe("one,two,four"); expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] [[three]] +[toggle[three],[four]]").join(",")).toBe("one,two,four");
expect(wiki.filterTiddlers("[[Tiddler Three]tags[]] [[three]] [[four]] +[toggle[three],[five]]").join(",")).toBe("one,two,five,four");
}); });
it("should handle multiple operands for search-replace", function() { it("should handle multiple operands for search-replace", function() {