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

Merge branch 'master' into sk-heap-analytics

Browse source
This commit is contained in:
Shane Kilkelly 2016-06-15 15:35:47 +01:00
commit c8302e090f
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Compile/CompileController.coffee
View file

@ -101,7 +101,7 @@ module.exports = CompileController =
logger.err err:err, project_id:project_id, "something went wrong compile and downloading pdf"
res.sendStatus 500
url = "/project/#{project_id}/output/output.pdf"
CompileController.proxyToClsi project_id, user_id, url, req, res, next
CompileController.proxyToClsi project_id, url, req, res, next
getFileFromClsi: (req, res, next = (error) ->) ->
project_id = req.params.Project_id

2
services/web/app/views/project/editor/pdf.jade
View file

@ -2,7 +2,7 @@ div.full-size.pdf(ng-controller="PdfController")
.toolbar.toolbar-tall
.btn-group(
dropdown,
tooltip="#{translate('recompile_pdf')} ({{modifierKey}} + Enter)"
tooltip-html="'#{translate('recompile_pdf')} <span class=\"keyboard-shortcut\">({{modifierKey}} + Enter)</span>'"
tooltip-class="keyboard-tooltip"
tooltip-popup-delay="500"
tooltip-append-to-body="true"

6
services/web/public/stylesheets/app/editor/pdf.less
View file

@ -170,5 +170,11 @@
}
.keyboard-tooltip {
.tooltip-inner {
max-width: none;
}
}
.keyboard-shortcut {
white-space: nowrap;
}

4
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View file

@ -352,9 +352,9 @@ describe "CompileController", ->
it "should proxy the res to the clsi with correct url", (done)->
@CompileController.compileAndDownloadPdf @req, @res
sinon.assert.calledWith @CompileController.proxyToClsi, @project_id, @user_id, "/project/#{@project_id}/output/output.pdf", @req, @res
sinon.assert.calledWith @CompileController.proxyToClsi, @project_id, "/project/#{@project_id}/output/output.pdf", @req, @res
@CompileController.proxyToClsi.calledWith(@project_id, @user_id, "/project/#{@project_id}/output/output.pdf", @req, @res).should.equal true
@CompileController.proxyToClsi.calledWith(@project_id, "/project/#{@project_id}/output/output.pdf", @req, @res).should.equal true
done()
describe "wordCount", ->