Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: migrate to theme-ui from rebass

Browse Source
This commit is contained in:
Abdullah Atta
2022-08-31 06:33:37 +05:00
parent 79f8b5e95e
commit d81f5dba65
865 changed files with 18115 additions and 23501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/core/api/settings.js
View File

@@ -1,20 +1,21 @@
/* This file is part of the Notesnook project (https://notesnook.com/)
*
* Copyright (C) 2022 Streetwriters (Private) Limited
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
This file is part of the Notesnook project (https://notesnook.com/)
Copyright (C) 2022 Streetwriters (Private) Limited
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { EV, EVENTS } from "../common";
import id from "../utils/id";
@@ -55,15 +56,15 @@ class Settings {
);
this._settings.groupOptions = {
...this._settings.groupOptions,
...item.groupOptions,
...item.groupOptions
};
this._settings.toolbarConfig = {
...this._settings.toolbarConfig,
...item.toolbarConfig,
...item.toolbarConfig
};
this._settings.aliases = {
...this._settings.aliases,
...item.aliases,
...item.aliases
};
this._settings.dateModified = Date.now();
} else {
@@ -97,7 +98,7 @@ class Settings {
: key === "tags"
? "dateCreated"
: "dateEdited",
sortDirection: "desc",
sortDirection: "desc"
}
);
}
@@ -184,7 +185,7 @@ class Settings {
aliases: {},
dateModified: 0,
dateCreated: 0,
...(settings || {}),
...(settings || {})
};
}