From c6d2b4f1e79159097200920fdb5b32a668b4916a Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 25 May 2018 13:46:54 +0100 Subject: [PATCH 1/2] Use single rich text include instead of split toolbar & body includes --- services/web/app/views/project/editor/editor.pug | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index 3cac3a9490..184b7e854b 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/services/web/app/views/project/editor/editor.pug @@ -33,7 +33,7 @@ div.full-size( i.fa.fa-arrow-left |   #{translate("open_a_file_on_the_left")} - != moduleIncludes('editor:toolbar', locals) + != moduleIncludes('editor:main', locals) #editor( ace-editor="editor", @@ -73,8 +73,6 @@ div.full-size( line-height="settings.lineHeight || ui.defaultLineHeight" ) - != moduleIncludes('editor:body', locals) - include ./review-panel .ui-layout-east From d0b160d9a2b403dfd5ea478071aa397749867332 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Fri, 25 May 2018 13:48:35 +0100 Subject: [PATCH 2/2] Rename flag for clarity --- services/web/app/views/project/editor/editor.pug | 2 +- services/web/public/coffee/ide/editor/EditorManager.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index 184b7e854b..c24d967da7 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/services/web/app/views/project/editor/editor.pug @@ -37,7 +37,7 @@ div.full-size( #editor( ace-editor="editor", - ng-if="!editor.richText", + ng-if="!editor.showRichText", ng-show="!!editor.sharejs_doc && !editor.opening", style=showRichText ? "top: 32px" : "", theme="settings.theme", diff --git a/services/web/public/coffee/ide/editor/EditorManager.coffee b/services/web/public/coffee/ide/editor/EditorManager.coffee index e3cabf8e98..7246e09b83 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 - richText: false + showRichText: false } @$scope.$on "entity:selected", (event, entity) =>