Selaa lähdekoodia

Move logic for selectively loading labels.

Only load labels if the user has write permission
Shane Kilkelly 9 vuotta sitten
vanhempi
sitoutus
5e37b1dac1

+ 0 - 1
services/web/app/views/project/editor/editor.pug

@@ -37,7 +37,6 @@ div.full-size(
 			keybindings="settings.mode",
 			keybindings="settings.mode",
 			font-size="settings.fontSize",
 			font-size="settings.fontSize",
 			auto-complete="settings.autoComplete",
 			auto-complete="settings.autoComplete",
-			enable-auto-complete-features="!anonymous"
 			spell-check="!anonymous",
 			spell-check="!anonymous",
 			spell-check-language="project.spellCheckLanguage"
 			spell-check-language="project.spellCheckLanguage"
 			highlights="onlineUserCursorHighlights[editor.open_doc_id]"
 			highlights="onlineUserCursorHighlights[editor.open_doc_id]"

+ 7 - 3
services/web/public/coffee/ide.coffee

@@ -130,9 +130,6 @@ define [
 		ide.binaryFilesManager = new BinaryFilesManager(ide, $scope)
 		ide.binaryFilesManager = new BinaryFilesManager(ide, $scope)
 		ide.labelsManager = new LabelsManager(ide, $scope, labels)
 		ide.labelsManager = new LabelsManager(ide, $scope, labels)
 
 
-		$timeout () ->
-			ide.labelsManager.loadProjectLabelsFromServer()
-
 		inited = false
 		inited = false
 		$scope.$on "project:joined", () ->
 		$scope.$on "project:joined", () ->
 			return if inited
 			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.
 					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.
 					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 = [
 		DARK_THEMES = [
 			"ambiance", "chaos", "clouds_midnight", "cobalt", "idle_fingers",
 			"ambiance", "chaos", "clouds_midnight", "cobalt", "idle_fingers",

+ 3 - 4
services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -44,7 +44,6 @@ define [
 				keybindings: "="
 				keybindings: "="
 				fontSize: "="
 				fontSize: "="
 				autoComplete: "="
 				autoComplete: "="
-				enableAutoCompleteFeatures: "="
 				sharejsDoc: "="
 				sharejsDoc: "="
 				spellCheck: "="
 				spellCheck: "="
 				spellCheckLanguage: "="
 				spellCheckLanguage: "="
@@ -95,9 +94,9 @@ define [
 				highlightsManager     = new HighlightsManager(scope, editor, element)
 				highlightsManager     = new HighlightsManager(scope, editor, element)
 				cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
 				cursorPositionManager = new CursorPositionManager(scope, editor, element, localStorage)
 				trackChangesManager   = new TrackChangesManager(scope, editor, element)
 				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
 				# Prevert Ctrl|Cmd-S from triggering save dialog
 				editor.commands.addCommand
 				editor.commands.addCommand