sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(pr): indentation and simplify

Browse source
This commit is contained in:
Matteo Pagliazzi 2014-12-29 21:21:54 +01:00
parent 752161b284
commit 4a37bec652
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
public/js/controllers/settingsCtrl.js
View file

@ -65,13 +65,8 @@ habitrpg.controller('SettingsCtrl',
User.set({'preferences.language': $scope.language.code});
}
$scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy'];
$scope.changeDateFormat = function(){
var dateFormat= User.user.preferences.dateFormat;
User.set({'preferences.dateFormat': dateFormat});
}
$scope.availableFormats = ['MM/dd/yyyy','dd/MM/yyyy'];
$scope.reroll = function(){
User.user.ops.reroll({});
$rootScope.$state.go('tasks');

2
src/models/user.js
View file

@ -279,7 +279,7 @@ var UserSchema = new Schema({
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
costume: Boolean,
dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy'], 'default': 'MM/dd/yyyy'},
sleep: {type: Boolean, 'default': false},
sleep: {type: Boolean, 'default': false},
stickyHeader: {type: Boolean, 'default': true},
disableClasses: {type: Boolean, 'default': false},
newTaskEdit: {type: Boolean, 'default': false},

4
views/options/settings.jade
View file

@ -39,9 +39,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
.form-horizontal
h5=env.t('dateFormat')
select.form-control(ng-model='user.preferences.dateFormat', ng-options='DF for DF in availableFormats', ng-change='changeDateFormat()')
select.form-control(ng-model='user.preferences.dateFormat', ng-options='DF for DF in availableFormats', ng-change='set({"preferences.dateFormat": user.preferences.dateFormat})')
.checkbox
label
input(type='checkbox', ng-click='hideHeader() ', ng-checked='user.preferences.hideHeader!==true')