rythondev/multi-task-widget-cross-platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added TaskSeparator config setting

Browse source
This commit is contained in:
liyunze 2023-11-25 10:44:44 +08:00
parent 6dbf541022
commit 3c86c9ccc5
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs.js
View file

@ -7,6 +7,7 @@ const configs = (function () {
const automaticDoneIndex = true; // true or false - Automatically assume first unfinished task is complete
const pointsName = "points"; // string
const pointsPerTask = 10; // integer
const taskSeparator = [";", ","]; // array of strings
// animation
const scrollSpeed = 40; // milliseconds
@ -356,6 +357,7 @@ const configs = (function () {
automaticDoneIndex,
pointsName,
pointsPerTask,
taskSeparator,
headerGoogleFont,
taskGoogleFont,
};

38
scripts/taskList.js
View file

@ -19,6 +19,7 @@ const scrollSpeed = configs.animation.scrollSpeed;
const responses = configs.responses;
let scrolling = false;
let primaryAnimation, secondaryAnimation;
const taskSeparator = configs.settings.taskSeparator;
function loadGoogleFont(font) {
WebFont.load({
@ -308,8 +309,12 @@ function addTask(username, userColor, task) {
let tasksFailedToAdd = [];
// if task has commas
if (task.includes(",")) {
let tasksToAdd = task.split(",").map((t) => t.trim());
if (taskSeparator.some((char) => task.includes(char))) {
let tasksToAdd = [];
let char = taskSeparator.find((element) => task.includes(element));
tasksToAdd = task.split(char).map((t) => t.trim());
if (
incompleteTasksCount(username) + tasksToAdd.length >
@ -559,8 +564,13 @@ function removeTask(username, task) {
let tasksFailedToRemove = [];
// check if there's a comma in the task (multiple tasks)
if (task.includes(",")) {
let tasksToRemove = task.split(",").map((t) => t.trim());
if (task.includes(",") || task.includes(";")) {
let tasksToRemove = [];
let char = taskSeparator.find((element) => task.includes(element));
tasksToRemove = task.split(char).map((t) => t.trim());
for (const t of tasksToRemove) {
let index = tasks[username].todos.findIndex(
(task) => task.text.toLowerCase() === t.toLowerCase()
@ -749,8 +759,15 @@ function markTaskDone(username, task) {
let tasksFailedToComplete = [];
// check if there's a comma in the task (multiple tasks)
if (task.includes(",")) {
let tasksToMarkDone = task.split(",").map((t) => t.trim());
if (task.includes(",") || task.includes(";")) {
// let tasksToMarkDone = task.split(",").map((t) => t.trim());
let tasksToMarkDone = [];
let char = taskSeparator.find((element) => task.includes(element));
tasksToMarkDone = task.split(char).map((t) => t.trim());
for (const t of tasksToMarkDone) {
let index = tasks[username].todos.findIndex(
(task) => task.text.toLowerCase() === t.toLowerCase()
@ -963,8 +980,13 @@ function markTaskUndone(username, task) {
let tasksFailedToMarkUndone = [];
// check if there's a comma in the task (multiple tasks)
if (task.includes(",")) {
let tasksToMarkUndone = task.split(",").map((t) => t.trim());
if (task.includes(",") || task.includes(";")) {
let tasksToMarkUndone;
let char = taskSeparator.find((element) => task.includes(element));
tasksToMarkUndone = task.split(char).map((t) => t.trim());
for (const t of tasksToMarkUndone) {
let index = tasks[username].todos.findIndex(
(task) => task.text.toLowerCase() === t.toLowerCase()