From 670d4438dc6f86f8a457f26a2950b96b4b793b6b Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Thu, 3 Aug 2017 15:16:54 +0100
Subject: [PATCH 1/2] If track-changes is not enabled, don't show hotkeys for
 it.

---
 services/web/app/views/project/editor/hotkeys.pug          | 6 +++---
 .../ide/hotkeys/controllers/HotkeysController.coffee       | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/services/web/app/views/project/editor/hotkeys.pug b/services/web/app/views/project/editor/hotkeys.pug
index cab8ea09b3..6069394840 100644
--- a/services/web/app/views/project/editor/hotkeys.pug
+++ b/services/web/app/views/project/editor/hotkeys.pug
@@ -90,8 +90,8 @@ script(type="text/ng-template", id="hotkeysModalTemplate")
 					span.combination Ctrl + Space 
 					span.description Search References
 		
-		h3 #{translate("review")}
-		.row
+		h3(ng-if="trackChangesVisible") #{translate("review")}
+		.row(ng-if="trackChangesVisible")
 			.col-xs-4
 				.hotkey
 					span.combination {{ctrl}} + J
@@ -108,4 +108,4 @@ script(type="text/ng-template", id="hotkeysModalTemplate")
 	.modal-footer
 		button.btn.btn-default(
 			ng-click="cancel()"
-		) #{translate("ok")}
\ No newline at end of file
+		) #{translate("ok")}
diff --git a/services/web/public/coffee/ide/hotkeys/controllers/HotkeysController.coffee b/services/web/public/coffee/ide/hotkeys/controllers/HotkeysController.coffee
index 0ec2c46cf1..65b513eda2 100644
--- a/services/web/public/coffee/ide/hotkeys/controllers/HotkeysController.coffee
+++ b/services/web/public/coffee/ide/hotkeys/controllers/HotkeysController.coffee
@@ -10,13 +10,16 @@ define [
 				templateUrl: "hotkeysModalTemplate"
 				controller:  "HotkeysModalController"
 				size: "lg"
+				resolve:
+					trackChangesVisible: () -> $scope.project.features.trackChangesVisible
 			}
 		
-	App.controller "HotkeysModalController", ($scope, $modalInstance)->
+	App.controller "HotkeysModalController", ($scope, $modalInstance, trackChangesVisible)->
+		$scope.trackChangesVisible = trackChangesVisible
 		if ace.require("ace/lib/useragent").isMac
 			$scope.ctrl = "Cmd"
 		else
 			$scope.ctrl = "Ctrl"
 		
 		$scope.cancel = () ->
-			$modalInstance.dismiss()
\ No newline at end of file
+			$modalInstance.dismiss()

From 9cc461605ec3bed51f56b6b2f3916fcb047a7729 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Thu, 3 Aug 2017 15:17:28 +0100
Subject: [PATCH 2/2] 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