mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-24 22:33:16 +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

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

@ -8,186 +8,186 @@ Extended filter operators to manipulate the current list.
\*/ \*/
(function () { (function () {
/*jslint node: true, browser: true */ /*jslint node: true, browser: true */
/*global $tw: false */ /*global $tw: false */
"use strict"; "use strict";
/* /*
Fetch titles from the current list Fetch titles from the current list
*/ */
var prepare_results = function (source) { var prepare_results = function (source) {
var results = []; var results = [];
source(function (tiddler, title) { source(function (tiddler, title) {
results.push(title); results.push(title);
}); });
return results; return results;
}; };
/* /*
Moves a number of items from the tail of the current list before the item named in the operand Moves a number of items from the tail of the current list before the item named in the operand
*/ */
exports.putbefore = function (source, operator) { exports.putbefore = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -1) : results.slice(0, -1) :
results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count)); results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index, -count));
}; };
/* /*
Moves a number of items from the tail of the current list after the item named in the operand Moves a number of items from the tail of the current list after the item named in the operand
*/ */
exports.putafter = function (source, operator) { exports.putafter = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -1) : results.slice(0, -1) :
results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); results.slice(0, index + 1).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
}; };
/* /*
Replaces the item named in the operand with a number of items from the tail of the current list Replaces the item named in the operand with a number of items from the tail of the current list
*/ */
exports.replace = function (source, operator) { exports.replace = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return (index === -1) ? return (index === -1) ?
results.slice(0, -count) : results.slice(0, -count) :
results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count)); results.slice(0, index).concat(results.slice(-count)).concat(results.slice(index + 1, -count));
}; };
/* /*
Moves a number of items from the tail of the current list to the head of the list Moves a number of items from the tail of the current list to the head of the list
*/ */
exports.putfirst = function (source, operator) { exports.putfirst = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return results.slice(-count).concat(results.slice(0, -count)); return results.slice(-count).concat(results.slice(0, -count));
}; };
/* /*
Moves a number of items from the head of the current list to the tail of the list Moves a number of items from the head of the current list to the tail of the list
*/ */
exports.putlast = function (source, operator) { exports.putlast = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,1); count = $tw.utils.getInt(operator.suffix,1);
return results.slice(count).concat(results.slice(0, count)); return results.slice(count).concat(results.slice(0, count));
}; };
/* /*
Moves the item named in the operand a number of places forward or backward in the list Moves the item named in the operand a number of places forward or backward in the list
*/ */
exports.move = function (source, operator) { exports.move = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand), index = results.indexOf(operator.operand),
count = $tw.utils.getInt(operator.suffix,1), count = $tw.utils.getInt(operator.suffix,1),
marker = results.splice(index, 1), marker = results.splice(index, 1),
offset = (index + count) > 0 ? index + count : 0; offset = (index + count) > 0 ? index + count : 0;
return results.slice(0, offset).concat(marker).concat(results.slice(offset)); return results.slice(0, offset).concat(marker).concat(results.slice(offset));
}; };
/* /*
Returns the items from the current list that are after the item named in the operand Returns the items from the current list that are after the item named in the operand
*/ */
exports.allafter = function (source, operator) { exports.allafter = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand); index = results.indexOf(operator.operand);
return (index === -1) ? [] : return (index === -1) ? [] :
(operator.suffix) ? results.slice(index) : (operator.suffix) ? results.slice(index) :
results.slice(index + 1); results.slice(index + 1);
}; };
/* /*
Returns the items from the current list that are before the item named in the operand Returns the items from the current list that are before the item named in the operand
*/ */
exports.allbefore = function (source, operator) { exports.allbefore = function (source, operator) {
var results = prepare_results(source), var results = prepare_results(source),
index = results.indexOf(operator.operand); index = results.indexOf(operator.operand);
return (index === -1) ? [] : return (index === -1) ? [] :
(operator.suffix) ? results.slice(0, index + 1) : (operator.suffix) ? results.slice(0, index + 1) :
results.slice(0, index); results.slice(0, index);
}; };
/* /*
Appends the items listed in the operand array to the tail of the current list Appends the items listed in the operand array to the tail of the current list
*/ */
exports.append = function (source, operator) { exports.append = function (source, operator) {
var append = $tw.utils.parseStringArray(operator.operand, "true"), var append = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = parseInt(operator.suffix) || append.length; count = parseInt(operator.suffix) || append.length;
return (append.length === 0) ? results : return (append.length === 0) ? results :
(operator.prefix) ? results.concat(append.slice(-count)) : (operator.prefix) ? results.concat(append.slice(-count)) :
results.concat(append.slice(0, count)); results.concat(append.slice(0, count));
}; };
/* /*
Prepends the items listed in the operand array to the head of the current list Prepends the items listed in the operand array to the head of the current list
*/ */
exports.prepend = function (source, operator) { exports.prepend = function (source, operator) {
var prepend = $tw.utils.parseStringArray(operator.operand, "true"), var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = $tw.utils.getInt(operator.suffix,prepend.length); count = $tw.utils.getInt(operator.suffix,prepend.length);
return (prepend.length === 0) ? results : return (prepend.length === 0) ? results :
(operator.prefix) ? prepend.slice(-count).concat(results) : (operator.prefix) ? prepend.slice(-count).concat(results) :
prepend.slice(0, count).concat(results); prepend.slice(0, count).concat(results);
}; };
/* /*
Returns all items from the current list except the items listed in the operand array Returns all items from the current list except the items listed in the operand array
*/ */
exports.remove = function (source, operator) { exports.remove = function (source, operator) {
var array = $tw.utils.parseStringArray(operator.operand, "true"), var array = $tw.utils.parseStringArray(operator.operand, "true"),
results = prepare_results(source), results = prepare_results(source),
count = parseInt(operator.suffix) || array.length, count = parseInt(operator.suffix) || array.length,
p, p,
len, len,
index; index;
len = array.length - 1; len = array.length - 1;
for (p = 0; p < count; ++p) { for (p = 0; p < count; ++p) {
if (operator.prefix) { if (operator.prefix) {
index = results.indexOf(array[len - p]); index = results.indexOf(array[len - p]);
} else { } else {
index = results.indexOf(array[p]); index = results.indexOf(array[p]);
} }
if (index !== -1) { if (index !== -1) {
results.splice(index, 1); results.splice(index, 1);
} }
} }
return results; return results;
}; };
/* /*
Returns all items from the current list sorted in the order of the items in the operand array Returns all items from the current list sorted in the order of the items in the operand array
*/ */
exports.sortby = function (source, operator) { exports.sortby = function (source, operator) {
var results = prepare_results(source); var results = prepare_results(source);
if (!results || results.length < 2) { if (!results || results.length < 2) {
return results; return results;
} }
var lookup = $tw.utils.parseStringArray(operator.operand, "true"); var lookup = $tw.utils.parseStringArray(operator.operand, "true");
results.sort(function (a, b) { results.sort(function (a, b) {
return lookup.indexOf(a) - lookup.indexOf(b); return lookup.indexOf(a) - lookup.indexOf(b);
}); });
return results; return results;
}; };
/*
Removes all duplicate items from the current list
*/
exports.unique = function (source, operator) {
var results = prepare_results(source);
var set = results.reduce(function (a, b) {
if (a.indexOf(b) < 0) {
a.push(b);
}
return a;
}, []);
return set;
};
/*
Removes all duplicate items from the current list
*/
exports.unique = function (source, operator) {
var results = prepare_results(source);
var set = results.reduce(function (a, b) {
if (a.indexOf(b) < 0) {
a.push(b);
}
return a;
}, []);
return set;
};
/* /*
Toggles an item in the current list. Toggles an item in the current list.
*/ */
@ -196,17 +196,19 @@ 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() {