mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Nest the overall theme property under ace.
This commit is contained in:
parent
64c29787c0
commit
307a98851d
4 changed files with 4 additions and 5 deletions
|
@ -338,7 +338,7 @@ module.exports = ProjectController =
|
|||
syntaxValidation: user.ace.syntaxValidation
|
||||
fontFamily: user.ace.fontFamily
|
||||
lineHeight: user.ace.lineHeight
|
||||
overallTheme: user.overallTheme
|
||||
overallTheme: user.ace.overallTheme
|
||||
}
|
||||
trackChangesState: project.track_changes
|
||||
privilegeLevel: privilegeLevel
|
||||
|
|
|
@ -70,6 +70,8 @@ module.exports = UserController =
|
|||
user.ace.mode = req.body.mode
|
||||
if req.body.editorTheme?
|
||||
user.ace.theme = req.body.editorTheme
|
||||
if req.body.overallTheme?
|
||||
user.ace.overallTheme = req.body.overallTheme
|
||||
if req.body.fontSize?
|
||||
user.ace.fontSize = req.body.fontSize
|
||||
if req.body.autoComplete?
|
||||
|
@ -86,8 +88,6 @@ module.exports = UserController =
|
|||
user.ace.fontFamily = req.body.fontFamily
|
||||
if req.body.lineHeight?
|
||||
user.ace.lineHeight = req.body.lineHeight
|
||||
if req.body.overallTheme?
|
||||
user.overallTheme = req.body.overallTheme
|
||||
|
||||
user.save (err)->
|
||||
newEmail = req.body.email?.trim().toLowerCase()
|
||||
|
|
|
@ -27,6 +27,7 @@ UserSchema = new Schema
|
|||
ace : {
|
||||
mode : {type : String, default: 'none'}
|
||||
theme : {type : String, default: 'textmate'}
|
||||
overallTheme : {type: String, default: "" }
|
||||
fontSize : {type : Number, default:'12'}
|
||||
autoComplete : {type : Boolean, default: true}
|
||||
autoPairDelimiters : {type : Boolean, default: true}
|
||||
|
@ -72,7 +73,6 @@ UserSchema = new Schema
|
|||
id: { type: Number }
|
||||
accessToken: { type: String }
|
||||
refreshToken: { type: String }
|
||||
overallTheme: { type: String, default: "" }
|
||||
awareOfV2: { type:Boolean, default: false }
|
||||
|
||||
conn = mongoose.createConnection(Settings.mongo.url, {
|
||||
|
|
|
@ -10,7 +10,6 @@ define [
|
|||
_defaultDepartments = []
|
||||
|
||||
ctrl.addUniversityToSelection = (universityName) ->
|
||||
console.log universityName
|
||||
{ name: universityName, isUserSuggested: true }
|
||||
# Populates the countries dropdown
|
||||
UserAffiliationsDataService
|
||||
|
|
Loading…
Reference in a new issue