فهرست منبع

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

Refactor loading rich text
Alasdair Smith 8 سال پیش
والد
کامیت
cc9d18d991
2فایلهای تغییر یافته به همراه3 افزوده شده و 5 حذف شده
  1. 2 4
      services/web/app/views/project/editor/editor.pug
  2. 1 1
      services/web/public/coffee/ide/editor/EditorManager.coffee

+ 2 - 4
services/web/app/views/project/editor/editor.pug

@@ -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

+ 1 - 1
services/web/public/coffee/ide/editor/EditorManager.coffee

@@ -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) =>