github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2591 from overleaf/pr-avoid-out-of-sync-error-spellcheck

Browse source 
Avoid out of sync error spellcheck

GitOrigin-RevId: e9772c01ffc0ffaca5d137e8e43e797903b727cd
This commit is contained in:
Eric Mc Sween 2020-02-27 07:47:26 -05:00 committed by Copybot
parent 77c75bf223
commit c120309dd0
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/frontend/js/ide/editor/directives/aceEditor/spell-check/SpellCheckAdapter.js
View file

@ -31,6 +31,10 @@ define([
return rows.map(rowIdx => this.editor.session.doc.getLine(rowIdx))
}
getSelectionContents() {
return this.editor.getSelectedText()
}
normalizeChangeEvent(e) {
return e
}

17
services/web/frontend/js/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.js
View file

@ -54,6 +54,8 @@ define([], function() {
capacity: 10000
})
this.selectedHighlightContents = null
$(document).on('click', e => {
if (e.which !== 3) {
this.closeContextMenu()
@ -84,6 +86,15 @@ define([], function() {
onChange(e) {
if (this.isSpellCheckEnabled()) {
this.$scope.$applyAsync(() => {
if (
this.selectedHighlightContents &&
this.selectedHighlightContents !==
this.adapter.getSelectionContents()
) {
this.closeContextMenu()
}
})
this.markLinesAsUpdated(this.adapter.normalizeChangeEvent(e))
this.adapter.highlightedWordManager.clearHighlightTouchingRange(e)
this.runSpellCheckSoon(200)
@ -122,7 +133,8 @@ define([], function() {
if (highlight) {
this.adapter.preventContextMenuEventDefault(e)
this.adapter.selectHighlightedWord(highlight)
this.$scope.$apply(() => {
this.$scope.$applyAsync(() => {
this.selectedHighlightContents = this.adapter.getSelectionContents()
this.$scope.spellMenu = {
open: true,
top: coords.y + 'px',
@ -141,7 +153,8 @@ define([], function() {
(this.$scope != null ? this.$scope.spellMenu : undefined) &&
this.$scope.spellMenu.open !== false
) {
this.$scope.$apply(() => {
this.selectedHighlightContents = null
this.$scope.$applyAsync(() => {
this.$scope.spellMenu.open = false
})
}