From 1d6314a2c1e22ace35da71c3776cc94b494bc0bd Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Mon, 21 Jul 2014 15:39:15 +0100
Subject: [PATCH] add Ctrl-Enter hotkey

---
 services/web/app/views/project/editor/editor.jade    |  3 ++-
 .../coffee/ide/editor/directives/aceEditor.coffee    | 12 +++++++++++-
 .../coffee/ide/pdf/controllers/PdfController.coffee  |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade
index aeeda6acfb..1e2d1dfd27 100644
--- a/services/web/app/views/project/editor/editor.jade
+++ b/services/web/app/views/project/editor/editor.jade
@@ -26,7 +26,8 @@ div.full-size(
 			goto-line="editor.gotoLine",
 			resize-on="layout:main:resize,layout:pdf:resize",
 			annotations="pdf.logEntryAnnotations[editor.open_doc_id]",
-			read-only="!permissions.write"
+			read-only="!permissions.write",
+			on-ctrl-enter="recompile"
 		)
 
 	.ui-layout-east
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
index 26cb5ced1e..5f2eceffab 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
@@ -34,7 +34,8 @@ define [
 				text: "="
 				readOnly: "="
 				annotations: "="
-				navigateHighlights: "="
+				navigateHighlights: "=",
+				onCtrlEnter: "="
 			}
 			link: (scope, element, attrs) ->
 				# Don't freak out if we're already in an apply callback
@@ -76,6 +77,15 @@ define [
 						ace.require("ace/ext/searchbox").Search(editor, true)
 					readOnly: true
 				editor.commands.removeCommand "replace"
+				
+				scope.$watch "onCtrlEnter", (callback) ->
+					if callback?
+						editor.commands.addCommand 
+							name: "compile",
+							bindKey: win: "Ctrl-Enter", mac: "Command-Enter"
+							exec: (editor) =>
+								callback()
+							readOnly: true
 
 				# Make '/' work for search in vim mode.
 				editor.showCommandLine = (arg) =>
diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
index 82e9048dbb..ea812ca3b8 100644
--- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
+++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
@@ -107,6 +107,9 @@ define [
 				.error () ->
 					$scope.pdf.compiling = false
 					$scope.pdf.error = true
+					
+		# This needs to be public.
+		ide.$scope.recompile = $scope.recompile
 
 		$scope.clearCache = () ->
 			$http {