helper variables don't need to be wrapped in their own object.

This commit is contained in:
Manuel Friedli 2014-07-03 21:06:06 +02:00
parent 3d0245abfa
commit 08cca0a915
6 changed files with 238 additions and 278 deletions

View file

@ -14,17 +14,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
var h = {
"_es_ist": {1:[1,2,4,5,6]},
"_nach": {4:[8,9,10,11]},
"_vor": {4:[1,2,3]},
"_halb": {5:[1,2,3,4]},
"_5": {1:[8,9,10,11]},
"_10": {2:[1,2,3,4]},
"_15": {3:[5,6,7,8,9,10,11]},
"_20": {2:[5,6,7,8,9,10,11]},
"_45": {3:[1,2,3,4,5,6,7,8,9,10,11]}
};
var es_ist = {1: [1, 2, 4, 5, 6]};
var uhr = {10: [9, 10, 11]};
var nach = {4: [8, 9, 10, 11]};
var vor = {4: [1, 2, 3]};
var halb = {5: [1, 2, 3, 4]};
var fuenf = {1: [8, 9, 10, 11]};
var zehn = {2: [1, 2, 3, 4]};
var viertel = {3: [5, 6, 7, 8, 9, 10, 11]};
var zwanzig = {2: [5, 6, 7, 8, 9, 10, 11]};
var dreiviertel = {3: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]};
var layout = {
"version": 2,
"language": 'Deutsch',
@ -40,19 +40,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'SIEBENZWÖLF',
'ZEHNEUNKUHR'
],
"permanent": h._es_ist,
"permanent": es_ist,
"minutes": {
"5,6,7,8,9": [h._5, h._nach],
"10,11,12,13,14": [h._10, h._nach],
"15,16,17,18,19": [h._15, h._nach],
"20,21,22,23,24": [h._20, h._nach],
"25,26,27,28,29": [h._5, h._vor, h._halb],
"30,31,32,33,34": h._halb,
"35,36,37,38,39": [h._5, h._nach, h._halb],
"40,41,42,43,44": [h._20, h._vor],
"45,46,47,48,49": h._45,
"50,51,52,53,54": [h._10, h._vor],
"55,56,57,58,59": [h._5, h._vor]
"0,1,2,3,4": uhr,
"5,6,7,8,9": [fuenf, nach],
"10,11,12,13,14": [zehn, nach],
"15,16,17,18,19": [viertel, nach],
"20,21,22,23,24": [zwanzig, nach],
"25,26,27,28,29": [fuenf, vor, halb],
"30,31,32,33,34": halb,
"35,36,37,38,39": [fuenf, nach, halb],
"40,41,42,43,44": [zwanzig, vor],
"45,46,47,48,49": dreiviertel,
"50,51,52,53,54": [zehn, vor],
"55,56,57,58,59": [fuenf, vor]
},
"hours": {
"0,12": {9: [7, 8, 9, 10, 11]},

View file

@ -15,16 +15,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
(function () {
'use strict';
// hilfsvariablen
var h = {
"_es_isch": {1: [1, 2, 4, 5, 6, 7]},
"_ab": {4: [1, 2]},
"_vor": {3: [9, 10, 11]},
"_haubi": {4: [4, 5, 6, 7, 8]},
"_5": {1: [9, 10, 11]},
"_10": {2: [9, 10, 11]},
"_15": {2: [1, 2, 3, 4, 5, 6]},
"_20": {3: [1, 2, 3, 4, 5, 6]}
};
var es_isch = {1: [1, 2, 4, 5, 6, 7]};
var ab = {4: [1, 2]};
var vor = {3: [9, 10, 11]};
var haubi = {4: [4, 5, 6, 7, 8]};
var fuef = {1: [9, 10, 11]};
var zae = {2: [9, 10, 11]};
var viertu = {2: [1, 2, 3, 4, 5, 6]};
var zwaenzg = {3: [1, 2, 3, 4, 5, 6]};
var layout = {
// version: zur Zeit immer 2 (Pflichtattribut)
"version": 2,
@ -44,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'ZWÖUFINAUHR'
],
// Permanent aktive Buchstaben. <array-or-object>, vgl. ausführliche Beschreibung bei "minutes".
"permanent": h._es_isch,
"permanent": es_isch,
/*
* Minuten: Objekt im folgenden Format:
* {
@ -66,17 +64,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* Bei Minute 5 sind die Buchstaben 1 und 2 der Zeile 3 sowie die Buchstaben 10 und 11 der Zeile 4 aktiv.
*/
"minutes": {
"5,6,7,8,9": [h._5, h._ab],
"10,11,12,13,14": [h._10, h._ab],
"15,16,17,18,19": [h._15, h._ab],
"20,21,22,23,24": [h._20, h._ab],
"25,26,27,28,29": [h._5, h._vor, h._haubi],
"30,31,32,33,34": h._haubi,
"35,36,37,38,39": [h._5, h._ab, h._haubi],
"40,41,42,43,44": [h._20, h._vor],
"45,46,47,48,49": [h._15, h._vor],
"50,51,52,53,54": [h._10, h._vor],
"55,56,57,58,59": [h._5, h._vor]
"5,6,7,8,9": [fuef, ab],
"10,11,12,13,14": [zae, ab],
"15,16,17,18,19": [viertu, ab],
"20,21,22,23,24": [zwaenzg, ab],
"25,26,27,28,29": [fuef, vor, haubi],
"30,31,32,33,34": haubi,
"35,36,37,38,39": [fuef, ab, haubi],
"40,41,42,43,44": [zwaenzg, vor],
"45,46,47,48,49": [viertu, vor],
"50,51,52,53,54": [zae, vor],
"55,56,57,58,59": [fuef, vor]
},
// Die Stunden; gleiches Format wie bei den Minuten
"hours": {

View file

@ -14,17 +14,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
var h = {
"_es_isch": {1: [1, 2, 4, 5, 6, 7]},
"_genau": {3: [7, 8, 9, 10, 11]},
"_ab": {4: [4, 5]},
"_vor": {4: [1, 2, 3]},
"_haubi": {4: [7, 8, 9, 10, 11]},
"_5": {1: [9, 10, 11]},
"_10": {2: [9, 10, 11]},
"_15": {2: [1, 2, 3, 4, 5, 6]},
"_20": {3: [1, 2, 3, 4, 5, 6]}
};
var es_isch = {1: [1, 2, 4, 5, 6, 7]};
var genau = {3: [7, 8, 9, 10, 11]};
var ab = {4: [4, 5]};
var vor = {4: [1, 2, 3]};
var haubi = {4: [7, 8, 9, 10, 11]};
var fuef = {1: [9, 10, 11]};
var zae = {2: [9, 10, 11]};
var viertu = {2: [1, 2, 3, 4, 5, 6]};
var zwaenzg = {3: [1, 2, 3, 4, 5, 6]};
var layout = {
"version": 2,
"language": 'Bärndütsch (genau)',
@ -40,20 +38,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'ZÄNIERBEUFI',
'ZWÖUFINAUHR'
],
"permanent": h._es_isch,
"permanent": es_isch,
"minutes": {
"0": h._genau,
"5,6,7,8,9": [h._5, h._ab],
"10,11,12,13,14": [h._10, h._ab],
"15,16,17,18,19": [h._15, h._ab],
"20,21,22,23,24": [h._20, h._ab],
"25,26,27,28,29": [h._5, h._vor, h._haubi],
"30,31,32,33,34": h._haubi,
"35,36,37,38,39": [h._5, h._ab, h._haubi],
"40,41,42,43,44": [h._20, h._vor],
"45,46,47,48,49": [h._15, h._vor],
"50,51,52,53,54": [h._10, h._vor],
"55,56,57,58,59": [h._5, h._vor]
"0": genau,
"5,6,7,8,9": [fuef, ab],
"10,11,12,13,14": [zae, ab],
"15,16,17,18,19": [viertu, ab],
"20,21,22,23,24": [zwaenzg, ab],
"25,26,27,28,29": [fuef, vor, haubi],
"30,31,32,33,34": haubi,
"35,36,37,38,39": [fuef, ab, haubi],
"40,41,42,43,44": [zwaenzg, vor],
"45,46,47,48,49": [viertu, vor],
"50,51,52,53,54": [zae, vor],
"55,56,57,58,59": [fuef, vor]
},
"hours": {
"0,12": {10: [1, 2, 3, 4, 5, 6]},

View file

@ -14,18 +14,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
var h = {
"_it_is": {1: [1, 2, 4, 5]},
"_half": {4: [1, 2, 3, 4]},
"_to": {4: [10, 11]},
"_past": {5: [1, 2, 3, 4]},
"_o_clock": {10: [6, 7, 8, 9, 10, 11]},
"_5": {3: [7, 8, 9, 10]},
"_10": {4: [6, 7, 8]},
"_15": {2: [1, 3, 4, 5, 6, 7, 8, 9]},
"_20": {3: [1, 2, 3, 4, 5, 6]},
"_25": {3: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]}
};
var it_is = {1: [1, 2, 4, 5]};
var half = {4: [1, 2, 3, 4]};
var to = {4: [10, 11]};
var past = {5: [1, 2, 3, 4]};
var o_clock = {10: [5, 6, 7, 8, 9, 10, 11]};
var five = {3: [7, 8, 9, 10]};
var ten = {4: [6, 7, 8]};
var a_quarter = {2: [1, 3, 4, 5, 6, 7, 8, 9]};
var twenty = {3: [1, 2, 3, 4, 5, 6]};
var twentyfive = {3: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]};
var layout = {
"version": 2,
"language": 'English',
@ -39,22 +38,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'FOURFIVETWO',
'EIGHTELEVEN',
'SEVENTWELVE',
'TENSEOCLOCK'
'TENSO\'CLOCK'
],
"permanent": h._it_is,
"permanent": it_is,
"minutes": {
"0,1,2,3,4": h._o_clock,
"5,6,7,8,9": [h._5, h._past],
"10,11,12,13,14": [h._10, h._past],
"15,16,17,18,19": [h._15, h._past],
"20,21,22,23,24": [h._20, h._past],
"25,26,27,28,29": [h._25, h._past],
"30,31,32,33,34": [h._half, h._past],
"35,36,37,38,39": [h._25, h._to],
"40,41,42,43,44": [h._20, h._to],
"45,46,47,48,49": [h._15, h._to],
"50,51,52,53,54": [h._10, h._to],
"55,56,57,58,59": [h._5, h._to]
"0,1,2,3,4": o_clock,
"5,6,7,8,9": [five, past],
"10,11,12,13,14": [ten, past],
"15,16,17,18,19": [a_quarter, past],
"20,21,22,23,24": [twenty, past],
"25,26,27,28,29": [twentyfive, past],
"30,31,32,33,34": [half, past],
"35,36,37,38,39": [twentyfive, to],
"40,41,42,43,44": [twenty, to],
"45,46,47,48,49": [a_quarter, to],
"50,51,52,53,54": [ten, to],
"55,56,57,58,59": [five, to]
},
"hours": {
"0,12": {9: [6, 7, 8, 9, 10, 11]},

View file

@ -1,4 +1,3 @@
/*
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -15,19 +14,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
var h = {
"_il_est": {1: [1, 2, 4, 5, 6]},
"_et": {8: [1, 2]},
"_moins": {7: [1, 2, 3, 4, 5]},
"_demie": {10: [4, 5, 6, 7, 8]},
"_heures": {6: [6, 7, 8, 9, 10, 11]},
"_le": {7: [7, 8]},
"_5": {9: [7, 8, 9, 10]},
"_10": {7: [9, 10, 11]},
"_15": {8: [4, 5, 6, 7, 8]},
"_20": {9: [1, 2, 3, 4, 5]},
"_25": {9: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]}
};
var il_est = {1: [1, 2, 4, 5, 6]};
var et = {8: [1, 2]};
var moins = {7: [1, 2, 3, 4, 5]};
var demie = {10: [4, 5, 6, 7, 8]};
var heures = {6: [6, 7, 8, 9, 10, 11]};
var le = {7: [7, 8]};
var cinq = {9: [7, 8, 9, 10]};
var dix = {7: [9, 10, 11]};
var quart = {8: [4, 5, 6, 7, 8]};
var vingt = {9: [1, 2, 3, 4, 5]};
var vingtcinq = {9: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]};
var layout = {
"version": 2,
"language": 'Français',
@ -43,66 +41,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
'VINGT-CINQU',
'ETSDEMIEPAM'
],
"permanent": h._il_est,
"permanent": il_est,
"minutes": {
"5,6,7,8,9": h._5,
"10,11,12,13,14": h._10,
"15,16,17,18,19": [h._et, h._15],
"20,21,22,23,24": h._20,
"25,26,27,28,29": h._25,
"30,31,32,33,34": [h._et, h._demie],
"35,36,37,38,39": [h._moins, h._25],
"40,41,42,43,44": [h._moins, h._20],
"45,46,47,48,49": [h._moins, h._le, h._15],
"50,51,52,53,54": [h._moins, h._10],
"55,56,57,58,59": [h._moins, h._5]
"5,6,7,8,9": cinq,
"10,11,12,13,14": dix,
"15,16,17,18,19": [et, quart],
"20,21,22,23,24": vingt,
"25,26,27,28,29": vingtcinq,
"30,31,32,33,34": [et, demie],
"35,36,37,38,39": [moins, vingtcinq],
"40,41,42,43,44": [moins, vingt],
"45,46,47,48,49": [moins, le, quart],
"50,51,52,53,54": [moins, dix],
"55,56,57,58,59": [moins, cinq]
},
"hours": {
"0": {5: [6, 7, 8, 9, 10, 11]},
"1,13": [
{3: [5, 6, 7]},
h._heures
],
"2,14": [
{1: [8, 9, 10, 11]},
h._heures
],
"3,15": [
{2: [7, 8, 9, 10, 11]},
h._heures
],
"4,16": [
{2: [1, 2, 3, 4, 5, 6]},
h._heures
],
"5,17": [
{4: [8, 9, 10, 11]},
h._heures
],
"6,18": [
{4: [5, 6, 7]},
h._heures
],
"7,19": [
{3: [8, 9, 10, 11]},
h._heures
],
"8,20": [
{4: [1, 2, 3, 4]},
h._heures
],
"9,21": [
{3: [1, 2, 3, 4]},
h._heures
],
"10,22": [
{5: [3, 4, 5]},
h._heures
],
"11,23": [
{6: [1, 2, 3, 4]},
h._heures
],
"1,13": [{3: [5, 6, 7]}, heures],
"2,14": [{1: [8, 9, 10, 11]}, heures],
"3,15": [{2: [7, 8, 9, 10, 11]}, heures],
"4,16": [{2: [1, 2, 3, 4, 5, 6]}, heures],
"5,17": [{4: [8, 9, 10, 11]}, heures],
"6,18": [{4: [5, 6, 7]}, heures],
"7,19": [{3: [8, 9, 10, 11]}, heures],
"8,20": [{4: [1, 2, 3, 4]}, heures],
"9,21": [{3: [1, 2, 3, 4]}, heures],
"10,22": [{5: [3, 4, 5]}, heures],
"11,23": [{6: [1, 2, 3, 4]}, heures],
"12": {5: [1, 2, 3, 4]}
},
"getHour": function (date) {

View file

@ -14,18 +14,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
(function () {
'use strict';
var h = {
"_sono_le": {1: [1, 2, 3, 4, 6, 7]},
"_e_l": {2: [1, 3, 4]},
"_e": {8: [1]},
"_meno": {7: [8, 9, 10, 11]},
"_mezza": {10: [7, 8, 9, 10, 11]},
"_5": {9: [6, 7, 8, 9, 10, 11]},
"_10": {10: [1, 2, 3, 4, 5]},
"_un_quarto": {8: [3, 4, 6, 7, 8, 9, 10, 11]},
"_20": {9: [1, 2, 3, 4, 5]},
"_25": {9: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]}
};
var sono_le = {1: [1, 2, 3, 4, 6, 7]};
var e_l = {2: [1, 3, 4]};
var e = {8: [1]};
var meno = {7: [8, 9, 10, 11]};
var mezza = {10: [7, 8, 9, 10, 11]};
var cinque = {9: [6, 7, 8, 9, 10, 11]};
var dieci = {10: [1, 2, 3, 4, 5]};
var un_quarto = {8: [3, 4, 6, 7, 8, 9, 10, 11]};
var venti = {9: [1, 2, 3, 4, 5]};
var venticinque = {9: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]};
var layout = {
"version": 2,
"language": 'Italiano',
@ -43,31 +42,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
],
"permanent": [],
"minutes": {
"5,6,7,8,9": [h._e, h._5],
"10,11,12,13,14": [h._e, h._10],
"15,16,17,18,19": [h._e, h._un_quarto],
"20,21,22,23,24": [h._e, h._20],
"25,26,27,28,29": [h._e, h._25],
"30,31,32,33,34": [h._e, h._mezza],
"35,36,37,38,39": [h._meno, h._25],
"40,41,42,43,44": [h._meno, h._20],
"45,46,47,48,49": [h._meno, h._un_quarto],
"50,51,52,53,54": [h._meno, h._10],
"55,56,57,58,59": [h._meno, h._5]
"5,6,7,8,9": [e, cinque],
"10,11,12,13,14": [e, dieci],
"15,16,17,18,19": [e, un_quarto],
"20,21,22,23,24": [e, venti],
"25,26,27,28,29": [e, venticinque],
"30,31,32,33,34": [e, mezza],
"35,36,37,38,39": [meno, venticinque],
"40,41,42,43,44": [meno, venti],
"45,46,47,48,49": [meno, un_quarto],
"50,51,52,53,54": [meno, dieci],
"55,56,57,58,59": [meno, cinque]
},
"hours": {
"0,12": [h._sono_le, {5: [1, 2, 3, 4, 5, 6]}],
"1,13": [h._e_l, {2: [5, 6, 7]}],
"2,14": [h._sono_le, {2: [9, 10, 11]}],
"3,15": [h._sono_le, {3: [1, 2, 3]}],
"4,16": [h._sono_le, {6: [1, 2, 3, 4, 5, 6, 7]}],
"5,17": [h._sono_le, {7: [1, 2, 3, 4, 5, 6]}],
"6,18": [h._sono_le, {6: [9, 10, 11]}],
"7,19": [h._sono_le, {5: [7, 8, 9, 10, 11]}],
"8,20": [h._sono_le, {3: [4, 5, 6, 7]}],
"9,21": [h._sono_le, {3: [8, 9, 10, 11]}],
"10,22": [h._sono_le, {4: [1, 2, 3, 4, 5]}],
"11,23": [h._sono_le, {4: [6, 7, 8, 9, 10, 11]}]
"0,12": [sono_le, {5: [1, 2, 3, 4, 5, 6]}],
"1,13": [e_l, {2: [5, 6, 7]}],
"2,14": [sono_le, {2: [9, 10, 11]}],
"3,15": [sono_le, {3: [1, 2, 3]}],
"4,16": [sono_le, {6: [1, 2, 3, 4, 5, 6, 7]}],
"5,17": [sono_le, {7: [1, 2, 3, 4, 5, 6]}],
"6,18": [sono_le, {6: [9, 10, 11]}],
"7,19": [sono_le, {5: [7, 8, 9, 10, 11]}],
"8,20": [sono_le, {3: [4, 5, 6, 7]}],
"9,21": [sono_le, {3: [8, 9, 10, 11]}],
"10,22": [sono_le, {4: [1, 2, 3, 4, 5]}],
"11,23": [sono_le, {4: [6, 7, 8, 9, 10, 11]}]
},
"getHour": function (date) {
var hour = date.getHours();