You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-11-23 22:36:32 +02:00
Tools: Implement "prefer-object-spread" eslint rule
This commit is contained in:
@@ -145,7 +145,7 @@ export default class BaseApplication {
|
||||
|
||||
public switchCurrentFolder(folder: any) {
|
||||
if (!this.hasGui()) {
|
||||
this.currentFolder_ = Object.assign({}, folder);
|
||||
this.currentFolder_ = { ...folder };
|
||||
Setting.setValue('activeFolderId', folder ? folder.id : '');
|
||||
} else {
|
||||
this.dispatch({
|
||||
@@ -792,7 +792,7 @@ export default class BaseApplication {
|
||||
await shim.fsDriver().removeAllThatStartWith(profileDir, 'edit-');
|
||||
|
||||
const extraFlags = await this.readFlagsFromFile(`${profileDir}/flags.txt`);
|
||||
initArgs = Object.assign(initArgs, extraFlags);
|
||||
initArgs = { ...initArgs, ...extraFlags };
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user