From 9cc461605ec3bed51f56b6b2f3916fcb047a7729 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 3 Aug 2017 15:17:28 +0100 Subject: [PATCH] Prevent track-changes hotkey actions when not enabled. --- services/web/public/coffee/ide.coffee | 2 ++ .../ide/review-panel/controllers/ReviewPanelController.coffee | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 5824304bff..d37334649c 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -90,6 +90,8 @@ define [ $scope.chat = {} ide.toggleReviewPanel = $scope.toggleReviewPanel = () -> + if !$scope.project.features.trackChangesVisible + return $scope.ui.reviewPanelOpen = !$scope.ui.reviewPanelOpen event_tracking.sendMB "rp-toggle-panel", { value : $scope.ui.reviewPanelOpen } 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 e4d7855ed9..dc75fe1a19 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -416,6 +416,8 @@ define [ $scope.toggleReviewPanel() $scope.addNewCommentFromKbdShortcut = () -> + if !$scope.project.features.trackChangesVisible + return $scope.$broadcast "comment:select_line" if !$scope.ui.reviewPanelOpen $scope.toggleReviewPanel() @@ -575,6 +577,8 @@ define [ $scope.openTrackChangesUpgradeModal() $scope.toggleTrackChangesFromKbdShortcut = () -> + if !$scope.project.features.trackChangesVisible + return if $scope.editor.wantTrackChanges $scope.toggleTrackChanges false else