Merge branch 'stable'

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2019-08-15 08:52:34 +02:00
14 changed files with 126 additions and 116 deletions

View File

@@ -85,7 +85,7 @@ class TabContext {
if (utils.isDesktop()) {
// keyboard plugin is not loaded in mobile
this.$noteTitle.bind('keydown', 'return', () => {
utils.bindElShortcut(this.$noteTitle, 'return', () => {
this.getComponent().focus();
return false; // to not propagate the enter into the editor (causes issues with codemirror)