From 3802df5cfa19a7c60673605f9b136ba237dde371 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 13 Feb 2018 08:27:41 +0000 Subject: [PATCH 1/3] Use popup instance variable like Ace autocompleter does --- .../aceEditor/auto-complete/AutoCompleteManager.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee index db8432bc1e..78d12eebc3 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee @@ -224,7 +224,7 @@ define [ # is likely to end up with `\href{}ref{}` if !data? completions = this.completions - popup = editor.completer.popup + popup = this.popup data = popup.getData(popup.getRow()) data.completer = insertMatch: (editor, matchData) -> From 5d3ecdb9247119faa715e441202f2fee44fb327a Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 13 Feb 2018 08:27:48 +0000 Subject: [PATCH 2/3] Add explicit editor init event --- .../public/coffee/ide/editor/directives/aceEditor.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 716fd2ee9d..134a3629ab 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -91,8 +91,8 @@ define [ else editor.setOption('behavioursEnabled', false) - window.editors ||= [] - window.editors.push editor + window._debug_editors ||= [] + window._debug_editors.push editor scope.name = attrs.aceEditor @@ -430,6 +430,8 @@ define [ scope.$on '$destroy', () -> detachFromAce(scope.sharejsDoc) + scope.$emit "#{scope.name}:inited", editor + template: """
Date: Tue, 13 Feb 2018 08:43:00 +0000 Subject: [PATCH 3/3] Don't error when detaching from history with no sharejsDoc --- .../web/public/coffee/ide/editor/directives/aceEditor.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index 134a3629ab..a128ecacb5 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -428,7 +428,8 @@ define [ rendererData.lineHeight = editor.renderer.lineHeight scope.$on '$destroy', () -> - detachFromAce(scope.sharejsDoc) + if scope.sharejsDoc? + detachFromAce(scope.sharejsDoc) scope.$emit "#{scope.name}:inited", editor