Max/SolidScribe
Max/SolidScribe
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Minor bug fixes

Browse Source
This commit is contained in:
Max G 2020-03-13 23:51:45 +00:00
parent f481a97a8c
commit 4533f6065d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/NoteInputPanel.vue
View File

@ -455,9 +455,10 @@
if(!this.$store.getters.getIsUserOnMobile){ if(!this.$store.getters.getIsUserOnMobile){
// this.editor.focus() // this.editor.focus()
if(this.noteTitle && this.noteTitle.length == 0){ if(this.noteTitle.length == 0){
this.$refs.titleTextarea.focus() this.$refs.titleTextarea.focus()
} else { } else {
this.editor.focus()
this.editor.moveCursorToEnd() this.editor.moveCursorToEnd()
} }

6
client/src/stores/mainStore.js
View File

@ -94,9 +94,9 @@ export default new Vuex.Store({
//Save all the totals for the user //Save all the totals for the user
state.userTotals = totalsObject state.userTotals = totalsObject
Object.keys(totalsObject).forEach( key => { // Object.keys(totalsObject).forEach( key => {
console.log(key + ' -- ' + totalsObject[key]) // console.log(key + ' -- ' + totalsObject[key])
}) // })
} }
}, },

6
server/models/Note.js
View File

@ -340,8 +340,8 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
Note.get(userId, noteId) Note.get(userId, noteId)
.then(noteObject => { .then(noteObject => {
if(!noteObject.text || !usersCurrentText){ if(!noteObject.text || !usersCurrentText || noteObject.encrypted == 1){
resolve(null) return resolve(null)
} }
let oldText = noteObject.text.replace(/(\r\n|\n|\r)/gm,"") let oldText = noteObject.text.replace(/(\r\n|\n|\r)/gm,"")
@ -349,7 +349,7 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
if(noteObject.updated == lastUpdated){ if(noteObject.updated == lastUpdated){
// console.log('No note diff') // console.log('No note diff')
resolve(null) return resolve(null)
} }
if(noteObject.updated > lastUpdated){ if(noteObject.updated > lastUpdated){