mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-24 06:13:17 +00:00
Code Issues Releases Wiki Activity

Is draft (#6442)

Browse Source 
* corrected [!is[draft]] to be a proper complement

* Ensuring [is[draft]] and [!is[draft]] are complements

* Made [is[draft]] more analogous to .isDraft()
This commit is contained in:
Cameron Fischer 2022-02-22 11:41:29 -05:00 committed by GitHub
parent 95bd694a65
commit d0b5b2124a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/modules/filters/is/draft.js
View File

@ -19,13 +19,13 @@ exports.draft = function(source,prefix,options) {
var results = [];
if(prefix === "!") {
source(function(tiddler,title) {
if(!tiddler || !$tw.utils.hop(tiddler.fields,"draft.of")) {
if(!tiddler || !tiddler.isDraft()) {
results.push(title);
}
});
} else {
source(function(tiddler,title) {
if(tiddler && $tw.utils.hop(tiddler.fields,"draft.of") && (tiddler.fields["draft.of"].length !== 0)) {
if(tiddler && tiddler.isDraft()) {
results.push(title);
}
});

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

@ -581,6 +581,34 @@ Tests the filtering mechanism.
expect(wiki.filterTiddlers("[!title[Tiddler Three]is[orphan]sort[title]]").join(",")).toBe("a fourth tiddler,filter regexp test,TiddlerOne");
expect(wiki.filterTiddlers("[!title[Tiddler Three]!is[orphan]]").join(",")).toBe("$:/ShadowPlugin,$:/TiddlerTwo,has filter,hasList,one");
});
it("should handle the '[is[draft]]' operator", function() {
var wiki = new $tw.Wiki();
wiki.addTiddlers([
{title: "A"},
{title: "Draft of 'A'", "draft.of": "A", "draft.title": "A"},
{title: "B"},
{title: "Draft of 'B'", "draft.of": "B"},
{title: "C"},
// Not a true draft. Doesn't have draft.of
{title: "Draft of 'C'", "draft.title": "C"},
{title: "E"},
// Broken. Has draft.of, but it's empty. Still a draft
{title: "Draft of 'E'", "draft.of": "", "draft.title": ""}
// Not a draft. It doesn't exist.
//{title: "F"} // This one is deliberately missing
]);
// is analagous to [has[draft.of]],
// except they handle empty draft.of differently
expect(wiki.filterTiddlers("[all[]] F +[is[draft]]").join(",")).toEqual("Draft of 'A',Draft of 'B',Draft of 'E'");
expect(wiki.filterTiddlers("[all[]] F +[!is[draft]]").join(",")).toEqual("A,B,C,Draft of 'C',E,F");
// [is[draft]] and [!is[draft]] are proper complements
var included = wiki.filterTiddlers("[all[]] F +[is[draft]]")
var excluded = wiki.filterTiddlers("[all[]] F +[!is[draft]]")
var all = [].concat(included, excluded).sort();
// combined, they should have exactly one of everything.
expect(wiki.filterTiddlers("[all[]] F +[sort[]]")).toEqual(all);
});
});