From 25b995d3b83730c99c7786719eb5274c89bf51d1 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Tue, 10 Jul 2018 15:37:52 +0100 Subject: [PATCH 1/2] Initialise editor mode from localStorage --- services/web/public/coffee/ide.coffee | 2 +- services/web/public/coffee/ide/editor/EditorManager.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 4b2c9ef440..7e25f9ca64 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -136,7 +136,7 @@ define [ ide.referencesSearchManager = new ReferencesManager(ide, $scope) ide.connectionManager = new ConnectionManager(ide, $scope) ide.fileTreeManager = new FileTreeManager(ide, $scope) - ide.editorManager = new EditorManager(ide, $scope) + ide.editorManager = new EditorManager(ide, $scope, localStorage) ide.onlineUsersManager = new OnlineUsersManager(ide, $scope) if window.data.useV2History ide.historyManager = new HistoryV2Manager(ide, $scope) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index 7246e09b83..e1074fb14d 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -6,7 +6,7 @@ define [ "ide/editor/controllers/SavingNotificationController" ], (Document) -> class EditorManager - constructor: (@ide, @$scope) -> + constructor: (@ide, @$scope, localStorage) -> @$scope.editor = { sharejs_doc: null open_doc_id: null @@ -14,7 +14,7 @@ define [ opening: true trackChanges: false wantTrackChanges: false - showRichText: false + showRichText: localStorage("editor.mode.#{@$scope.project_id}") or false } @$scope.$on "entity:selected", (event, entity) => From d33c7f0149cf86740119a566f1779ece25bca994 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Wed, 11 Jul 2018 10:44:58 +0100 Subject: [PATCH 2/2] Use string key to initialise editor mode instead of boolean --- services/web/public/coffee/ide/editor/EditorManager.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index e1074fb14d..26ddc7dd33 100644 --- a/services/web/public/coffee/ide/editor/EditorManager.coffee +++ b/services/web/public/coffee/ide/editor/EditorManager.coffee @@ -14,7 +14,7 @@ define [ opening: true trackChanges: false wantTrackChanges: false - showRichText: localStorage("editor.mode.#{@$scope.project_id}") or false + showRichText: localStorage("editor.mode.#{@$scope.project_id}") == 'rich-text' } @$scope.$on "entity:selected", (event, entity) =>