github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-06 00:11:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3847 from overleaf/ae-user-select-out-of-sync

Browse source 
Display the Out Of Sync modal file contents in a readonly textarea

GitOrigin-RevId: b91ff3ad32c3ed07987858e83571887ae356f4f3
This commit is contained in:
Simon Detheridge 2021-03-30 16:40:26 +01:00 committed by Copybot
parent 9e2db00d53
commit 12f3e8d6bb
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,7 @@ block content
)
| {{showFileContents ? "Hide" : "Show"}} Local File Contents
.text-preview(ng-show="showFileContents")
.scroll-container
textarea.scroll-container(readonly="readonly" rows="{{editorContentRows}}")
| {{editorContent}}
.modal-footer

1
services/web/frontend/js/ide/services/ide.js
View file

@ -162,6 +162,7 @@ App.controller('OutOfSyncModalController', function(
$scope.title = title
$scope.message = message
$scope.editorContent = editorContent
$scope.editorContentRows = editorContent.split('\n').length
$scope.done = () => {
// Reload the page to avoid staying in an inconsistent state.

1
services/web/frontend/stylesheets/app/editor.less
View file

@ -494,6 +494,7 @@ CodeMirror
margin-top: @line-height-computed / 2;
.scroll-container {
max-height: 360px;
width: 100%;
background-color: white;
font-size: 0.8em;
line-height: 1.1em;