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

Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout

Browse source 
Fix single-quotes breaking layout directive
This commit is contained in:
Paulo Jorge Reis 2018-10-19 11:30:59 +01:00 committed by GitHub
commit 6dd9680af8
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,9 +67,9 @@ block content
ng-hide="state.loading", ng-hide="state.loading",
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") : false
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") : false
) )
.ui-layout-west .ui-layout-west
include ./editor/file-tree include ./editor/file-tree

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

@ -8,9 +8,9 @@ div.full-size(
initial-size-east="'50%'" initial-size-east="'50%'"
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") : false
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") : false
) )
.ui-layout-center( .ui-layout-center(
ng-controller="ReviewPanelController", ng-controller="ReviewPanelController",
@ -101,6 +101,7 @@ div.full-size(
ng-click="syncToCode()" ng-click="syncToCode()"
) )
i.synctex-control-icon i.synctex-control-icon
div.full-size( div.full-size(
ng-if="ui.pdfLayout == 'flat'" ng-if="ui.pdfLayout == 'flat'"
ng-show="ui.view == 'pdf'" ng-show="ui.view == 'pdf'"

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

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