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

Merge pull request #481 from sharelatex/ja-encode-project-names

Browse source 
Error if no project returned from joinProject
This commit is contained in:
Henry Oswald 2017-04-25 09:17:59 +01:00 committed by GitHub
commit f5267ac6ee
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,10 +105,16 @@ block requirejs
//- We need to do .replace(/\//g, '\\/') do that '</script>' -> '<\/script>'
//- and doesn't prematurely end the script tag.
script#data(type="application/json").
!{JSON.stringify({userSettings: userSettings, user: user}).replace(/\//g, '\\/')}
script(type="text/javascript").
window.data = JSON.parse($("#data").text());
script(type='text/javascript').
window.project_id = "!{project_id}";
window.userSettings = !{JSON.stringify(userSettings).replace(/\//g, '\\/')};
window.user = !{JSON.stringify(user).replace(/\//g, '\\/')};
var data = JSON.parse($("#data").text());
window.userSettings = data.userSettings;
window.user = data.user;
window.csrfToken = "!{csrfToken}";
window.anonymous = #{anonymous};
window.maxDocLength = #{maxDocLength};

4
services/web/public/coffee/ide/connection/ConnectionManager.coffee
View file

@ -146,7 +146,7 @@ define [], () ->
else
@ide.socket.disconnect()
@ide.showGenericMessageModal("Something went wrong connecting", """
Something went wrong connecting to your project. Please refresh is this continues to happen.
Something went wrong connecting to your project. Please refresh if this continues to happen.
""")
joinProject: () ->
@ -157,7 +157,7 @@ define [], () ->
@ide.socket.emit 'joinProject', {
project_id: @ide.project_id
}, (err, project, permissionsLevel, protocolVersion) =>
if err?
if err? or !project?
return @reportConnectionError(err)
if @$scope.protocolVersion? and @$scope.protocolVersion != protocolVersion