krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert input to select box

Browse Source
This commit is contained in:
Blade Barringer
2015-09-06 09:22:40 -05:00
parent 3a8eda6c1a
commit 085a785e4d
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/js/controllers/settingsCtrl.js
View File

@@ -65,13 +65,13 @@ habitrpg.controller('SettingsCtrl',
$scope.dayStart = User.user.preferences.dayStart;
$scope.openDayStartModal = function(dayStart) {
var flooredDayStart = Math.floor(dayStart);
$scope.dayStart = +dayStart;
var flooredDayStart = Math.floor($scope.dayStart);
if (dayStart !== flooredDayStart || dayStart < 0 || dayStart > 24 ) {
if ($scope.dayStart !== flooredDayStart || $scope.dayStart < 0 || $scope.dayStart > 24 ) {
return alert(window.env.t('enterNumber'));
}
$scope.dayStart = dayStart;
$scope.nextCron = _calculateNextCron();
$rootScope.openModal('change-day-start', { scope: $scope });

10
website/views/options/settings.jade
View File

@@ -91,11 +91,15 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
a(ng-click='showCustomDayStartInfo = !showCustomDayStartInfo') {{!showCustomDayStartInfo ? env.t('showMoreMore') : env.t('showMoreLess')}}
h5(ng-if='showCustomDayStartInfo')!=env.t('customDayStartInfo4')
.form-horizontal
.form-group
.col-sm-7
.input-group
input.form-control(type='number', min='0', max='23', ng-model='dayStart')
.input-group-addon= ':00 (' + env.t('24HrClock') + ')'
select.form-control(ng-model='dayStart')
- var number = 0
while number < 24
- var hour = number++ % 12
- var meridian = number < 12 ? 'AM' : 'PM'
option(value=number) #{hour ? hour : 12}:00 #{meridian}
.col-sm-5
br.visible-xs