From 085a785e4d28146f5853ad4aa5e294e8835cee59 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 6 Sep 2015 09:22:40 -0500 Subject: [PATCH] Convert input to select box --- website/public/js/controllers/settingsCtrl.js | 6 +++--- website/views/options/settings.jade | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/website/public/js/controllers/settingsCtrl.js b/website/public/js/controllers/settingsCtrl.js index 2d07e7cb45..f296f571ae 100644 --- a/website/public/js/controllers/settingsCtrl.js +++ b/website/public/js/controllers/settingsCtrl.js @@ -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 }); diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 039fe9f7a8..bc19a2970a 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -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