@@ -78,7 +78,7 @@ export const fetchNotes = () => {
7878 return axios
7979 . get (
8080 url ( '/notes' + ( lastModified ? '?pruneBefore=' + lastModified : '' ) ) ,
81- { headers }
81+ { headers } ,
8282 )
8383 . then ( response => {
8484 store . commit ( 'setSettings' , response . data . settings )
@@ -142,7 +142,7 @@ export const refreshNote = (noteId, lastETag) => {
142142 return axios
143143 . get (
144144 url ( '/notes/' + noteId ) ,
145- { headers }
145+ { headers } ,
146146 )
147147 . then ( response => {
148148 if ( note . conflict ) {
@@ -224,14 +224,14 @@ function _updateNote(note) {
224224 // everything is fine
225225 // => update note with remote data
226226 _updateLocalNote (
227- { ...updated , unsaved : false }
227+ { ...updated , unsaved : false } ,
228228 )
229229 } else {
230230 // content has changed locally in the meanwhile
231231 // => merge note, but exclude content
232232 _updateLocalNote (
233233 copyNote ( updated , note , [ 'content' ] ) ,
234- copyNote ( updated , { } )
234+ copyNote ( updated , { } ) ,
235235 )
236236 }
237237 } )
@@ -246,14 +246,14 @@ function _updateNote(note) {
246246 // content is already up-to-date
247247 // => update note with remote data
248248 _updateLocalNote (
249- { ...remote , unsaved : false }
249+ { ...remote , unsaved : false } ,
250250 )
251251 } else if ( remote . content === reference . content ) {
252252 // remote content has not changed
253253 // => use all other attributes and sync again
254254 _updateLocalNote (
255255 copyNote ( remote , note , [ 'content' ] ) ,
256- copyNote ( remote , { } )
256+ copyNote ( remote , { } ) ,
257257 )
258258 queueCommand ( note . id , 'content' )
259259 } else {
@@ -272,15 +272,15 @@ export const conflictSolutionLocal = note => {
272272 note . etag = note . conflict . etag
273273 _updateLocalNote (
274274 copyNote ( note . conflict , note , [ 'content' ] ) ,
275- copyNote ( note . conflict , { } )
275+ copyNote ( note . conflict , { } ) ,
276276 )
277277 store . commit ( 'setNoteAttribute' , { noteId : note . id , attribute : 'conflict' , value : undefined } )
278278 queueCommand ( note . id , 'content' )
279279}
280280
281281export const conflictSolutionRemote = note => {
282282 _updateLocalNote (
283- { ...note . conflict , unsaved : false }
283+ { ...note . conflict , unsaved : false } ,
284284 )
285285 store . commit ( 'setNoteAttribute' , { noteId : note . id , attribute : 'conflict' , value : undefined } )
286286}
0 commit comments