From 1522c50e3ea420281bcc33b2bed7b4f297a4ba96 Mon Sep 17 00:00:00 2001 From: David Vazgenovich Shakaryan Date: Fri, 28 Feb 2014 13:47:09 -0800 Subject: Improve timeformat code. --- options.css | 20 ++++++++++++++++---- options.html | 17 ++++++++--------- options.js | 33 ++++++++++++++------------------- tempo.js | 2 +- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/options.css b/options.css index 4660e31..7daef46 100644 --- a/options.css +++ b/options.css @@ -11,7 +11,7 @@ body { div#container { width: 20em; - height: 11em; + height: 11.2em; padding: 1em; margin: auto; position: absolute; @@ -31,14 +31,26 @@ h1 { margin: 0em; } -p#status { - color: #390; +div.section { + margin: 1em; +} + +div.section p { + margin: 0.2em 0em; +} + +div.section p.option { + margin-left: 1em; } -p#button { +div#button { text-align: center; } +p#status { + color: #390; +} + button { color: #ddd; background-color: #222; diff --git a/options.html b/options.html index 148d247..93b1cd6 100644 --- a/options.html +++ b/options.html @@ -11,16 +11,15 @@

Options

Time format: - -

Time format:

12-hour

24-hour

diff --git a/options.js b/options.js index 045b2b3..fd930c7 100644 --- a/options.js +++ b/options.js @@ -2,9 +2,12 @@ // Distributed under the terms of the GNU General Public License v2. // See http://www.gnu.org/licenses/gpl-2.0.txt for the full license text. -function save_options() { - var select = document.getElementById('timeformat'); - var timeformat = select.children[select.selectedIndex].value; +function saveOptions() { + var timeformat = 24; + if(document.getElementById('t12').checked) { + var timeformat = 12; + } + localStorage['timeformat'] = timeformat; var status = document.getElementById('status'); @@ -13,30 +16,22 @@ function save_options() { setTimeout(function() {status.innerHTML = ' '}, 1000); } -function restore_options() { +function restoreOptions() { var timeformat = localStorage['timeformat']; if(!timeformat) { - timeformat = '24'; + timeformat = 24; } - var select = document.getElementById('timeformat'); - - for(var i = 0; i < select.children.length; i++) { - var child = select.children[i]; + var option = document.getElementById('t' + timeformat); - if(child.value == timeformat) { - child.selected = 'true'; - - break; - } - } + option.checked = true; } -function start_options() { - restore_options(); +function startOptions() { + restoreOptions(); - document.querySelector('#save').addEventListener('click', save_options); + document.querySelector('#save').addEventListener('click', saveOptions); } -window.onload = start_options; +window.onload = startOptions; diff --git a/tempo.js b/tempo.js index 7117884..aafb078 100644 --- a/tempo.js +++ b/tempo.js @@ -26,7 +26,7 @@ function updateTime() { var dm = date.getMonth(); var dy = date.getFullYear(); - if(timeformat == '12') { + if(timeformat == 12) { h = (h + 11) % 12 + 1; } -- cgit v1.2.3-70-g09d2