diff --git a/services/web/app/views/project/editor/review-panel.jade b/services/web/app/views/project/editor/review-panel.jade index 26049a057d..138b54fdd8 100644 --- a/services/web/app/views/project/editor/review-panel.jade +++ b/services/web/app/views/project/editor/review-panel.jade @@ -54,6 +54,7 @@ on-reject="rejectChange(entry_id);" on-accept="acceptChange(entry_id);" on-indicator-click="toggleReviewPanel();" + ng-click="gotoEntry(doc_id, entry)" ) div(ng-if="entry.type === 'comment'") @@ -63,6 +64,7 @@ on-resolve="" on-reply="submitReply(entry);" on-indicator-click="toggleReviewPanel();" + ng-click="gotoEntry(doc_id, entry)" ) .rp-nav diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index f0cbb4c048..015f51ee80 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -41,6 +41,11 @@ define [ return if !doc? @openDoc(doc) + openDocId: (doc_id, options = {}) -> + doc = @ide.fileTreeManager.findEntityById(doc_id) + return if !doc? + @openDoc(doc, options) + openDoc: (doc, options = {}) -> sl_console.log "[openDoc] Opening #{doc.id}" @$scope.ui.view = "editor" 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 7d2e47b76c..9c9a2bd7bc 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 @@ -305,6 +305,7 @@ define [ y = screen_position.row * renderer.lineHeight entry.screenPos ?= {} entry.screenPos.y = y + entry.docPos = doc_position @$scope.$apply() diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee index fb99d73cfd..b08e0d1ae8 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -146,7 +146,11 @@ define [ $scope.setSubView = (subView) -> $scope.reviewPanel.subView = subView - + + $scope.gotoEntry = (doc_id, entry) -> + console.log "Going to entry", entry.docPos + ide.editorManager.openDocId(doc_id, { gotoLine: entry.docPos.row + 1, gotoColumn: entry.docPos.column }) + # TODO: Eventually we need to get this from the server, and update it # when we get an id we don't know. This'll do for client side testing refreshUsers = () ->