github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #600 from sharelatex/as-refactor-rt-load

Browse source 
Refactor loading rich text
This commit is contained in:
Alasdair Smith 2018-05-31 10:11:01 +01:00 committed by GitHub
commit cc9d18d991
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/editor.pug
View file

@ -33,11 +33,11 @@ div.full-size(
i.fa.fa-arrow-left i.fa.fa-arrow-left
|   #{translate("open_a_file_on_the_left")} |   #{translate("open_a_file_on_the_left")}
!= moduleIncludes('editor:toolbar', locals) != moduleIncludes('editor:main', locals)
#editor( #editor(
ace-editor="editor", ace-editor="editor",
ng-if="!editor.richText", ng-if="!editor.showRichText",
ng-show="!!editor.sharejs_doc && !editor.opening", ng-show="!!editor.sharejs_doc && !editor.opening",
style=showRichText ? "top: 32px" : "", style=showRichText ? "top: 32px" : "",
theme="settings.theme", theme="settings.theme",
@ -73,8 +73,6 @@ div.full-size(
line-height="settings.lineHeight || ui.defaultLineHeight" line-height="settings.lineHeight || ui.defaultLineHeight"
) )
!= moduleIncludes('editor:body', locals)
include ./review-panel include ./review-panel
.ui-layout-east .ui-layout-east

2
services/web/public/coffee/ide/editor/EditorManager.coffee
View file

@ -14,7 +14,7 @@ define [
opening: true opening: true
trackChanges: false trackChanges: false
wantTrackChanges: false wantTrackChanges: false
richText: false showRichText: false
} }
@$scope.$on "entity:selected", (event, entity) => @$scope.$on "entity:selected", (event, entity) =>