Эх сурвалжийг харах

Only use custom togglers in v2.

Paulo Reis 8 жил өмнө
parent
commit
906f4899aa

+ 2 - 0
services/web/app/coffee/infrastructure/Features.coffee

@@ -16,5 +16,7 @@ module.exports = Features =
 				return Settings.accountMerge? and Settings.overleaf?
 			when 'rich-text'
 				return Settings.showRichText
+			when 'custom-togglers'
+				return Settings.overleaf?
 			else
 				throw new Error("unknown feature: #{feature}")

+ 3 - 3
services/web/app/views/project/editor.pug

@@ -62,9 +62,9 @@ block content
 					ng-hide="state.loading",
 					resize-on="layout:chat:resize",
 					minimum-restore-size-west="130"
-					custom-toggler-pane="'west'"
-					custom-toggler-msg-when-open="'" + translate("tooltip_hide_filetree") + "'"
-					custom-toggler-msg-when-closed="'" + translate("tooltip_show_filetree") + "'"
+					custom-toggler-pane=hasFeature('custom-togglers') ? "'west'" : "false"
+					custom-toggler-msg-when-open=hasFeature('custom-togglers') ? "'" + translate("tooltip_hide_filetree") + "'" : "false"
+					custom-toggler-msg-when-closed=hasFeature('custom-togglers') ? "'" + translate("tooltip_show_filetree") + "'" : "false"
 				)
 					.ui-layout-west
 						include ./editor/file-tree

+ 3 - 3
services/web/app/views/project/editor/editor.pug

@@ -8,9 +8,9 @@ div.full-size(
 	initial-size-east="'50%'"
 	minimum-restore-size-east="300"
 	allow-overflow-on="'center'"
-	custom-toggler-pane="'east'"
-	custom-toggler-msg-when-open="'" + translate("tooltip_hide_pdf") + "'"
-	custom-toggler-msg-when-closed="'" + translate("tooltip_show_pdf") + "'"
+	custom-toggler-pane=hasFeature('custom-togglers') ? "'east'" : "false"
+	custom-toggler-msg-when-open=hasFeature('custom-togglers') ? "'" + translate("tooltip_hide_pdf") + "'" : "false"
+	custom-toggler-msg-when-closed=hasFeature('custom-togglers') ? "'" + translate("tooltip_show_pdf") + "'" : "false"
 )
 	.ui-layout-center(
 		ng-controller="ReviewPanelController",

+ 4 - 4
services/web/public/coffee/ide/directives/layout.coffee

@@ -8,10 +8,10 @@ define [
 				pre: (scope, element, attrs) ->
 					name = attrs.layout
 
-					customTogglerPane = scope.$eval(attrs.customTogglerPane)
-					customTogglerMsgWhenOpen = scope.$eval(attrs.customTogglerMsgWhenOpen)
-					customTogglerMsgWhenClosed = scope.$eval(attrs.customTogglerMsgWhenClosed)
-					hasCustomToggler = customTogglerPane? and customTogglerMsgWhenOpen? and customTogglerMsgWhenClosed?
+					customTogglerPane = scope.$eval(attrs.customTogglerPane or "false")
+					customTogglerMsgWhenOpen = scope.$eval(attrs.customTogglerMsgWhenOpen or "false")
+					customTogglerMsgWhenClosed = scope.$eval(attrs.customTogglerMsgWhenClosed or "false")
+					hasCustomToggler = customTogglerPane != false and customTogglerMsgWhenOpen != false and customTogglerMsgWhenClosed != false
 
 					if attrs.spacingOpen?
 						spacingOpen = parseInt(attrs.spacingOpen, 10)