github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Paulo Reis 2018-10-18 15:33:09 +01:00
parent a1fa48b3ed
commit 4232732646
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

6
services/web/public/coffee/ide/directives/layout.coffee
View file

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