mirror of
https://github.com/overleaf/overleaf.git
synced 2024-09-16 02:52:31 -04:00
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
This commit is contained in:
commit
47d4ed9631
7 changed files with 20 additions and 6 deletions
|
@ -3,7 +3,7 @@ html(itemscope, itemtype='http://schema.org/Product')
|
||||||
block vars
|
block vars
|
||||||
|
|
||||||
head
|
head
|
||||||
script(type="text/javscript").
|
script(type="text/javascript").
|
||||||
// Stop superfish from loading
|
// Stop superfish from loading
|
||||||
window.similarproducts = true
|
window.similarproducts = true
|
||||||
|
|
||||||
|
|
|
@ -99,6 +99,9 @@ block content
|
||||||
},
|
},
|
||||||
"ace/ext-searchbox": {
|
"ace/ext-searchbox": {
|
||||||
deps: ["ace/ace"]
|
deps: ["ace/ace"]
|
||||||
|
},
|
||||||
|
"ace/ext-language_tools": {
|
||||||
|
deps: ["ace/ace"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
config:{
|
config:{
|
||||||
|
|
|
@ -362,5 +362,13 @@ module.exports =
|
||||||
# fieldName: 'LDAP User'
|
# fieldName: 'LDAP User'
|
||||||
# placeholder: 'LDAP User ID'
|
# placeholder: 'LDAP User ID'
|
||||||
# emailAtt: 'mail'
|
# emailAtt: 'mail'
|
||||||
|
|
||||||
|
#templateLinks: [{
|
||||||
|
# name : "CV projects",
|
||||||
|
# url : "/templates/cv"
|
||||||
|
#},{
|
||||||
|
# name : "all projects",
|
||||||
|
# url: "/templates/all"
|
||||||
|
#}]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"archiver": "0.9.0",
|
"archiver": "0.9.0",
|
||||||
"async": "0.6.2",
|
"async": "0.6.2",
|
||||||
"bcrypt": "0.7.5",
|
"bcrypt": "0.8.3",
|
||||||
"bufferedstream": "1.6.0",
|
"bufferedstream": "1.6.0",
|
||||||
"connect-redis": "1.4.5",
|
"connect-redis": "1.4.5",
|
||||||
"dateformat": "1.0.4-1.2.3",
|
"dateformat": "1.0.4-1.2.3",
|
||||||
|
|
|
@ -22,7 +22,8 @@ define [
|
||||||
@closeContextMenu()
|
@closeContextMenu()
|
||||||
|
|
||||||
@editor.on "changeSession", (e) =>
|
@editor.on "changeSession", (e) =>
|
||||||
@runSpellCheckSoon(200)
|
if @$scope.spellCheckEnabled and @$scope.spellCheckLanguage and @$scope.spellCheckLanguage != ""
|
||||||
|
@runSpellCheckSoon(200)
|
||||||
|
|
||||||
e.oldSession?.getDocument().off "change", onChange
|
e.oldSession?.getDocument().off "change", onChange
|
||||||
e.session.getDocument().on "change", onChange
|
e.session.getDocument().on "change", onChange
|
||||||
|
|
|
@ -17,9 +17,9 @@ define [
|
||||||
element.append(spinner)
|
element.append(spinner)
|
||||||
|
|
||||||
stop: (element) ->
|
stop: (element) ->
|
||||||
element.find('.fa-spin').removeClass('fa-spin')
|
element.find('.fa-spinner').removeClass('fa-spin')
|
||||||
|
|
||||||
remove: (element) ->
|
remove: (element) ->
|
||||||
element.find('.fa-spin').remove()
|
element.find('.fa-spinner').remove()
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
|
@ -36,9 +36,11 @@ describe 'LockManager - getting the lock', ->
|
||||||
describe "when the lock is initially set", ->
|
describe "when the lock is initially set", ->
|
||||||
beforeEach (done) ->
|
beforeEach (done) ->
|
||||||
startTime = Date.now()
|
startTime = Date.now()
|
||||||
|
tries = 0
|
||||||
@LockManager.LOCK_TEST_INTERVAL = 5
|
@LockManager.LOCK_TEST_INTERVAL = 5
|
||||||
@LockManager.tryLock = (doc_id, callback = (error, isFree) ->) ->
|
@LockManager.tryLock = (doc_id, callback = (error, isFree) ->) ->
|
||||||
if Date.now() - startTime < 20
|
if (Date.now() - startTime < 20) or (tries < 2)
|
||||||
|
tries = tries + 1
|
||||||
callback null, false
|
callback null, false
|
||||||
else
|
else
|
||||||
callback null, true
|
callback null, true
|
||||||
|
|
Loading…
Reference in a new issue