From 906f4899aa54c87befc42291823b7869da4aa399 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 22 Mar 2018 12:10:34 +0000 Subject: [PATCH] Only use custom togglers in v2. --- services/web/app/coffee/infrastructure/Features.coffee | 2 ++ services/web/app/views/project/editor.pug | 6 +++--- services/web/app/views/project/editor/editor.pug | 6 +++--- services/web/public/coffee/ide/directives/layout.coffee | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee index 6e39ee6370..5dfe73f05f 100644 --- a/services/web/app/coffee/infrastructure/Features.coffee +++ b/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}") diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index 9f72d364cf..8a0c7a8222 100644 --- a/services/web/app/views/project/editor.pug +++ b/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 diff --git a/services/web/app/views/project/editor/editor.pug b/services/web/app/views/project/editor/editor.pug index 52620b6a81..761911d2e8 100644 --- a/services/web/app/views/project/editor/editor.pug +++ b/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", diff --git a/services/web/public/coffee/ide/directives/layout.coffee b/services/web/public/coffee/ide/directives/layout.coffee index 9e9fae5e99..b411849cc9 100644 --- a/services/web/public/coffee/ide/directives/layout.coffee +++ b/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)