Przeglądaj źródła

Avoid using Angular eval for user-provided strings in the layout directive.

Paulo Reis 8 lat temu
rodzic
commit
4232732646

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

@@ -68,8 +68,8 @@ block content
 					resize-on="layout:chat:resize,history:toggle",
 					minimum-restore-size-west="130"
 					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"
+					custom-toggler-msg-when-open=hasFeature('custom-togglers') ? translate("tooltip_hide_filetree") : ""
+					custom-toggler-msg-when-closed=hasFeature('custom-togglers') ? translate("tooltip_show_filetree") : ""
 				)
 					.ui-layout-west
 						include ./editor/file-tree

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

@@ -9,8 +9,8 @@ div.full-size(
 	minimum-restore-size-east="300"
 	allow-overflow-on="'center'"
 	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"
+	custom-toggler-msg-when-open=hasFeature('custom-togglers') ? translate("tooltip_hide_pdf") : ""
+	custom-toggler-msg-when-closed=hasFeature('custom-togglers') ? translate("tooltip_show_pdf") : ""
 )
 	.ui-layout-center(
 		ng-controller="ReviewPanelController",

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

@@ -9,9 +9,9 @@ define [
 					name = attrs.layout
 
 					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
+					customTogglerMsgWhenOpen = attrs.customTogglerMsgWhenOpen
+					customTogglerMsgWhenClosed = attrs.customTogglerMsgWhenClosed
+					hasCustomToggler = customTogglerPane != false and customTogglerMsgWhenOpen != "" and customTogglerMsgWhenClosed != ""
 
 					if attrs.spacingOpen?
 						spacingOpen = parseInt(attrs.spacingOpen, 10)