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 #331 from sharelatex/ja-autocomplete-fix

Browse source 
Potential fix for the auto-complete bug
This commit is contained in:
James Allen 2018-02-13 09:41:00 +00:00 committed by GitHub
commit a427414920
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/public/coffee/ide/editor/directives/aceEditor.coffee
View file

@ -91,8 +91,8 @@ define [
else else
editor.setOption('behavioursEnabled', false) editor.setOption('behavioursEnabled', false)
window.editors ||= [] window._debug_editors ||= []
window.editors.push editor window._debug_editors.push editor
scope.name = attrs.aceEditor scope.name = attrs.aceEditor
@ -428,7 +428,10 @@ define [
rendererData.lineHeight = editor.renderer.lineHeight rendererData.lineHeight = editor.renderer.lineHeight
scope.$on '$destroy', () -> scope.$on '$destroy', () ->
detachFromAce(scope.sharejsDoc) if scope.sharejsDoc?
detachFromAce(scope.sharejsDoc)
scope.$emit "#{scope.name}:inited", editor
template: """ template: """
<div class="ace-editor-wrapper"> <div class="ace-editor-wrapper">

2
services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
View file

@ -224,7 +224,7 @@ define [
# is likely to end up with `\href{}ref{}` # is likely to end up with `\href{}ref{}`
if !data? if !data?
completions = this.completions completions = this.completions
popup = editor.completer.popup popup = this.popup
data = popup.getData(popup.getRow()) data = popup.getData(popup.getRow())
data.completer = data.completer =
insertMatch: (editor, matchData) -> insertMatch: (editor, matchData) ->