Merge branch 'stable'

This commit is contained in:
zadam 2019-06-30 20:15:37 +02:00
commit ec4abe0d81
3 changed files with 9 additions and 5 deletions

View File

@ -338,7 +338,9 @@ class TabContext {
} }
closeAutocomplete() { closeAutocomplete() {
this.$tabContent.find('.aa-input').autocomplete('close'); if (utils.isDesktop()) {
this.$tabContent.find('.aa-input').autocomplete('close');
}
} }
} }

View File

@ -49,7 +49,9 @@
</div> </div>
<div class="note-detail-component-wrapper"> <div class="note-detail-component-wrapper">
<div class="note-detail-text note-detail-component" tabindex="10000"></div> <div class="note-detail-text note-detail-component" tabindex="10000">
<div class="note-detail-text-editor"></div>
</div>
<div class="note-detail-code note-detail-component"></div> <div class="note-detail-code note-detail-component"></div>