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

Merge remote-tracking branch 'origin/master' into afc-multiple-managers

Browse source
This commit is contained in:
Alberto Fernández Capel 2018-07-16 09:45:11 +01:00
commit a72dec4b6e
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,10 @@ div.full-size(
'rp-loading-threads': reviewPanel.loadingThreads,\ 'rp-loading-threads': reviewPanel.loadingThreads,\
}" }"
) )
.loading-panel(ng-show="!editor.sharejs_doc || editor.opening") .loading-panel(
ng-show="!editor.sharejs_doc || editor.opening",
style=showRichText ? "top: 32px" : "",
)
span(ng-show="editor.open_doc_id") span(ng-show="editor.open_doc_id")
i.fa.fa-spin.fa-refresh i.fa.fa-spin.fa-refresh
|   #{translate("loading")}... |   #{translate("loading")}...

3
services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
View file

@ -37,6 +37,9 @@ define [], () ->
onCursorChange: () => onCursorChange: () =>
@emitCursorUpdateEvent() @emitCursorUpdateEvent()
onSyncToPdf: () =>
@$scope.$emit "cursor:#{@$scope.name}:syncToPdf"
storeFirstVisibleLine: () -> storeFirstVisibleLine: () ->
if @doc_id? if @doc_id?
docPosition = @localStorage("doc.position.#{@doc_id}") || {} docPosition = @localStorage("doc.position.#{@doc_id}") || {}

2
services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
View file

@ -718,6 +718,8 @@ define [
.then (highlights) -> .then (highlights) ->
$scope.pdf.highlights = highlights $scope.pdf.highlights = highlights
ide.$scope.$on "cursor:editor:syncToPdf", $scope.syncToPdf
$scope.syncToCode = () -> $scope.syncToCode = () ->
synctex synctex
.syncToCode($scope.pdf.position, includeVisualOffset: true, fromPdfPosition: true) .syncToCode($scope.pdf.position, includeVisualOffset: true, fromPdfPosition: true)