Minor bug fixes

client/src/components/NoteInputPanel.vue

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

client/src/stores/mainStore.js

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

server/models/Note.js

@@ -340,8 +340,8 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
 		Note.get(userId, noteId)
 		.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,"")
@@ -349,7 +349,7 @@ Note.getDiffText = (userId, noteId, usersCurrentText, lastUpdated) => {
 
 			if(noteObject.updated == lastUpdated){
 				// console.log('No note diff')
-				resolve(null)
+				return resolve(null)
 			}
 
 			if(noteObject.updated > lastUpdated){