github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 10:03:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move clsiServerId and compileGroup from ide to ide.$scope.pdf (#5314)

Browse source 
GitOrigin-RevId: 6050898614b4fc9dee52e893149acfda17c324a0
This commit is contained in:
Alf Eaton 2021-10-08 10:40:39 +01:00 committed by Copybot
parent 07ca18cdbb
commit ffc72416ff
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/frontend/js/features/pdf-preview/contexts/pdf-preview-context.js
View file

@ -55,7 +55,7 @@ export default function PdfPreviewProvider({ children }) {
const [, setLogEntryAnnotations] = useScopeValue('pdf.logEntryAnnotations')
// the id of the CLSI server which ran the compile
const [, setClsiServerId] = useScopeValue('ide.clsiServerId')
const [, setClsiServerId] = useScopeValue('pdf.clsiServerId')
// whether to display the editor and preview side-by-side or full-width ("flat")
const [pdfLayout, setPdfLayout] = useScopeValue('ui.pdfLayout')

2
services/web/frontend/js/ide/pdf/PdfManager.js
View file

@ -35,6 +35,8 @@ export default PdfManager = class PdfManager {
highlights: [],
position: null,
lastCompileTimestamp: null,
clsiServerId: null,
compileGroup: null,
}
}
}

12
services/web/frontend/js/ide/pdf/controllers/PdfController.js
View file

@ -374,11 +374,11 @@ App.controller(
let qs = {}
// add a query string parameter for the compile group
if (response.compileGroup != null) {
ide.compileGroup = qs.compileGroup = response.compileGroup
$scope.pdf.compileGroup = qs.compileGroup = response.compileGroup
}
// add a query string parameter for the clsi server id
if (response.clsiServerId != null) {
ide.clsiServerId = qs.clsiserverid = response.clsiServerId
$scope.pdf.clsiServerId = qs.clsiserverid = response.clsiServerId
}
// TODO(das7pad): drop this hack once 2747f0d40af8729304 has landed in clsi
@ -573,8 +573,8 @@ App.controller(
method: 'GET',
url: buildPdfDownloadUrl(options.pdfDownloadDomain, file.url),
params: {
compileGroup: ide.compileGroup,
clsiserverid: ide.clsiServerId,
compileGroup: $scope.pdf.compileGroup,
clsiserverid: $scope.pdf.clsiServerId,
},
}
return $http(opts)
@ -844,7 +844,7 @@ App.controller(
url: `/project/${$scope.project_id}/compile/stop`,
method: 'POST',
params: {
clsiserverid: ide.clsiServerId,
clsiserverid: $scope.pdf.clsiServerId,
},
headers: {
'X-Csrf-Token': window.csrfToken,
@ -865,7 +865,7 @@ App.controller(
url: `/project/${$scope.project_id}/output`,
method: 'DELETE',
params: {
clsiserverid: ide.clsiServerId,
clsiserverid: $scope.pdf.clsiServerId,
},
headers: {
'X-Csrf-Token': window.csrfToken,

4
services/web/frontend/js/ide/pdf/controllers/PdfSynctexController.js
View file

@ -107,7 +107,7 @@ App.factory('synctex', function (ide, $http, $q) {
file: path,
line: row + 1,
column,
clsiserverid: ide.clsiServerId,
clsiserverid: ide.$scope.pdf.clsiServerId,
},
})
.then(response => {
@ -172,7 +172,7 @@ App.factory('synctex', function (ide, $http, $q) {
page: position.page + 1,
h: h.toFixed(2),
v: v.toFixed(2),
clsiserverid: ide.clsiServerId,
clsiserverid: ide.$scope.pdf.clsiServerId,
},
})
.then(response => {