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

Nest the overall theme property under ace.

Browse source
This commit is contained in:
Paulo Reis 2018-08-28 10:10:16 +01:00
parent 64c29787c0
commit 307a98851d
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Project/ProjectController.coffee
View file

@ -338,7 +338,7 @@ module.exports = ProjectController =
syntaxValidation: user.ace.syntaxValidation syntaxValidation: user.ace.syntaxValidation
fontFamily: user.ace.fontFamily fontFamily: user.ace.fontFamily
lineHeight: user.ace.lineHeight lineHeight: user.ace.lineHeight
overallTheme: user.overallTheme overallTheme: user.ace.overallTheme
} }
trackChangesState: project.track_changes trackChangesState: project.track_changes
privilegeLevel: privilegeLevel privilegeLevel: privilegeLevel

4
services/web/app/coffee/Features/User/UserController.coffee
View file

@ -70,6 +70,8 @@ module.exports = UserController =
user.ace.mode = req.body.mode user.ace.mode = req.body.mode
if req.body.editorTheme? if req.body.editorTheme?
user.ace.theme = req.body.editorTheme user.ace.theme = req.body.editorTheme
if req.body.overallTheme?
user.ace.overallTheme = req.body.overallTheme
if req.body.fontSize? if req.body.fontSize?
user.ace.fontSize = req.body.fontSize user.ace.fontSize = req.body.fontSize
if req.body.autoComplete? if req.body.autoComplete?
@ -86,8 +88,6 @@ module.exports = UserController =
user.ace.fontFamily = req.body.fontFamily user.ace.fontFamily = req.body.fontFamily
if req.body.lineHeight? if req.body.lineHeight?
user.ace.lineHeight = req.body.lineHeight user.ace.lineHeight = req.body.lineHeight
if req.body.overallTheme?
user.overallTheme = req.body.overallTheme
user.save (err)-> user.save (err)->
newEmail = req.body.email?.trim().toLowerCase() newEmail = req.body.email?.trim().toLowerCase()

2
services/web/app/coffee/models/User.coffee
View file

@ -27,6 +27,7 @@ UserSchema = new Schema
ace : { ace : {
mode : {type : String, default: 'none'} mode : {type : String, default: 'none'}
theme : {type : String, default: 'textmate'} theme : {type : String, default: 'textmate'}
overallTheme : {type: String, default: "" }
fontSize : {type : Number, default:'12'} fontSize : {type : Number, default:'12'}
autoComplete : {type : Boolean, default: true} autoComplete : {type : Boolean, default: true}
autoPairDelimiters : {type : Boolean, default: true} autoPairDelimiters : {type : Boolean, default: true}
@ -72,7 +73,6 @@ UserSchema = new Schema
id: { type: Number } id: { type: Number }
accessToken: { type: String } accessToken: { type: String }
refreshToken: { type: String } refreshToken: { type: String }
overallTheme: { type: String, default: "" }
awareOfV2: { type:Boolean, default: false } awareOfV2: { type:Boolean, default: false }
conn = mongoose.createConnection(Settings.mongo.url, { conn = mongoose.createConnection(Settings.mongo.url, {

1
services/web/public/coffee/main/affiliations/components/affiliationForm.coffee
View file

@ -10,7 +10,6 @@ define [
_defaultDepartments = [] _defaultDepartments = []
ctrl.addUniversityToSelection = (universityName) -> ctrl.addUniversityToSelection = (universityName) ->
console.log universityName
{ name: universityName, isUserSuggested: true } { name: universityName, isUserSuggested: true }
# Populates the countries dropdown # Populates the countries dropdown
UserAffiliationsDataService UserAffiliationsDataService