From 2b94c69795dd7e7e1a1679fecc6c7349e495bc67 Mon Sep 17 00:00:00 2001 From: James Allen Date: Thu, 20 Oct 2016 12:19:57 +0100 Subject: [PATCH] Don't use the trackChanges engine in the history editor panel --- services/web/app/views/project/editor/editor.jade | 3 ++- .../web/public/coffee/ide/editor/directives/aceEditor.coffee | 3 ++- .../aceEditor/track-changes/TrackChangesManager.coffee | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade index c824130cbc..ecdc435831 100644 --- a/services/web/app/views/project/editor/editor.jade +++ b/services/web/app/views/project/editor/editor.jade @@ -39,7 +39,8 @@ div.full-size( syntax-validation="settings.syntaxValidation", review-panel="reviewPanel", on-scroll="onScroll", - scroll-events="scrollEvents" + scroll-events="scrollEvents", + track-changes-enabled="true" ) #review-panel .review-panel-scroller diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee index bc4e656a1c..0ba4f269e3 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee @@ -48,6 +48,7 @@ define [ reviewPanel: "=" onScroll: "=" scrollEvents: "=" + trackChangesEnabled: "=" } link: (scope, element, attrs) -> # Don't freak out if we're already in an apply callback @@ -74,7 +75,7 @@ define [ highlightsManager = new HighlightsManager(scope, editor, element) cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage) trackChangesManager = new TrackChangesManager(scope, editor, element) - if window.location.search.match /tcon=true/ # track changes on + if scope.trackChangesEnabled and window.location.search.match /tcon=true/ # track changes on trackChangesManager.enabled = true # Prevert Ctrl|Cmd-S from triggering save dialog diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee index bceb4b7d9a..80260f4888 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee @@ -103,7 +103,7 @@ define [ recalculateReviewEntriesScreenPositions: () -> session = @editor.getSession() renderer = @editor.renderer - for entry_id, entry of @$scope.reviewPanel.entries + for entry_id, entry of (@$scope.reviewPanel?.entries or {}) doc_position = @_shareJsOffsetToAcePosition(entry.offset) screen_position = session.documentToScreenPosition(doc_position.row, doc_position.column) y = screen_position.row * renderer.lineHeight