From 5e37b1dac19ec8deb9407ff1b47767de9d1ee3fb Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Wed, 14 Jun 2017 13:26:02 +0100
Subject: [PATCH] Move logic for selectively loading labels.

Only load labels if the user has write permission
---
 services/web/app/views/project/editor/editor.pug       |  1 -
 services/web/public/coffee/ide.coffee                  | 10 +++++++---
 .../coffee/ide/editor/directives/aceEditor.coffee      |  7 +++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug
index 3ae571f224..ebeeee6ceb 100644
--- a/services/web/app/views/project/editor/editor.pug
+++ b/services/web/app/views/project/editor/editor.pug
@@ -37,7 +37,6 @@ div.full-size(
 			keybindings="settings.mode",
 			font-size="settings.fontSize",
 			auto-complete="settings.autoComplete",
-			enable-auto-complete-features="!anonymous"
 			spell-check="!anonymous",
 			spell-check-language="project.spellCheckLanguage"
 			highlights="onlineUserCursorHighlights[editor.open_doc_id]"
diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee
index 04ae5d89e2..5824304bff 100644
--- a/services/web/public/coffee/ide.coffee
+++ b/services/web/public/coffee/ide.coffee
@@ -130,9 +130,6 @@ define [
 		ide.binaryFilesManager = new BinaryFilesManager(ide, $scope)
 		ide.labelsManager = new LabelsManager(ide, $scope, labels)
 
-		$timeout () ->
-			ide.labelsManager.loadProjectLabelsFromServer()
-
 		inited = false
 		$scope.$on "project:joined", () ->
 			return if inited
@@ -143,6 +140,13 @@ define [
 					We don't want to delete your data on ShareLaTeX, so this project still contains your history and collaborators.
 					If the project has been renamed please look in your project list for a new project under the new name.
 				""")
+			$timeout(
+				() ->
+					if $scope.permissions.write
+						ide.labelsManager.loadProjectLabelsFromServer()
+						_labelsInitialLoadDone = true
+				, 200
+			)
 
 		DARK_THEMES = [
 			"ambiance", "chaos", "clouds_midnight", "cobalt", "idle_fingers",
diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
index 9e231cc30a..6c2b81edc4 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor.coffee
@@ -44,7 +44,6 @@ define [
 				keybindings: "="
 				fontSize: "="
 				autoComplete: "="
-				enableAutoCompleteFeatures: "="
 				sharejsDoc: "="
 				spellCheck: "="
 				spellCheckLanguage: "="
@@ -95,9 +94,9 @@ define [
 				highlightsManager     = new HighlightsManager(scope, editor, element)
 				cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
 				trackChangesManager   = new TrackChangesManager(scope, editor, element)
-				if scope.enableAutoCompleteFeatures
-					labelsManager         = new LabelsManager(scope, editor, element, labels)
-					autoCompleteManager   = new AutoCompleteManager(scope, editor, element, labelsManager)
+				labelsManager = new LabelsManager(scope, editor, element, labels)
+				autoCompleteManager = new AutoCompleteManager(scope, editor, element, labelsManager)
+
 
 				# Prevert Ctrl|Cmd-S from triggering save dialog
 				editor.commands.addCommand