From 7da49f29d6504efe099ae890a8a6df29e41f2ad2 Mon Sep 17 00:00:00 2001 From: DariaKineva Date: Mon, 10 Oct 2016 23:57:58 +0500 Subject: [PATCH 1/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roman-time.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roman-time.js b/roman-time.js index f66353e..e24a7e0 100644 --- a/roman-time.js +++ b/roman-time.js @@ -5,7 +5,14 @@ * @returns {String} – время римскими цифрами (IX:V) */ function romanTime(time) { - // Немного авторского кода и замечательной магии + var h,m; + var roman = ["N","I","II","III","IV","V","VI","VII","VIII","IX","X","XI","XII"]; + if (!time || time.length > 5) { + throw new TypeError("Неверное время"); +} + h = Number(time[0])*10 + Number(time[1]); + m = Number(time[3])*10 + Number(time[4]); + var time = roman[h%12]+":"+roman[m%12]; return time; } From 6d2a440d94ba4c78f8ec340f6347efa8952c1138 Mon Sep 17 00:00:00 2001 From: DariaKineva Date: Wed, 12 Oct 2016 23:00:59 +0500 Subject: [PATCH 2/4] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=20?= =?UTF-8?q?=D1=81=20=D1=80=D0=B8=D0=BC=D1=81=D0=BA=D0=B8=D0=BC=D0=B8=20?= =?UTF-8?q?=D1=87=D0=B8=D1=81=D0=BB=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roman-time.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roman-time.js b/roman-time.js index e24a7e0..8f9e470 100644 --- a/roman-time.js +++ b/roman-time.js @@ -6,13 +6,13 @@ */ function romanTime(time) { var h,m; - var roman = ["N","I","II","III","IV","V","VI","VII","VIII","IX","X","XI","XII"]; + var roman = [ "N", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII" ]; if (!time || time.length > 5) { - throw new TypeError("Неверное время"); + throw new TypeError( "Неверное время" ); } - h = Number(time[0])*10 + Number(time[1]); - m = Number(time[3])*10 + Number(time[4]); - var time = roman[h%12]+":"+roman[m%12]; + h = Number(time[0]) * 10 + Number(time[1]); + m = Number(time[3]) * 10 + Number(time[4]); + var time = roman[h%12] + ":" + roman[m%12]; return time; } From 4d775735ef2d3c77ef4b1bc76986852cab73f6fc Mon Sep 17 00:00:00 2001 From: DariaKineva Date: Wed, 12 Oct 2016 23:29:36 +0500 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roman-time.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roman-time.js b/roman-time.js index 8f9e470..3fa86d7 100644 --- a/roman-time.js +++ b/roman-time.js @@ -5,14 +5,15 @@ * @returns {String} – время римскими цифрами (IX:V) */ function romanTime(time) { - var h,m; - var roman = [ "N", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII" ]; + var h; + var m; + var roman = ['N', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII']; if (!time || time.length > 5) { throw new TypeError( "Неверное время" ); } h = Number(time[0]) * 10 + Number(time[1]); m = Number(time[3]) * 10 + Number(time[4]); - var time = roman[h%12] + ":" + roman[m%12]; + var time = roman[h % 12] + ":" + roman[m % 12]; return time; } From 6dbf8adfa03e49940da7c9536e9efaa71f99c9e5 Mon Sep 17 00:00:00 2001 From: DariaKineva Date: Wed, 12 Oct 2016 23:30:50 +0500 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roman-time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roman-time.js b/roman-time.js index 3fa86d7..dab700b 100644 --- a/roman-time.js +++ b/roman-time.js @@ -9,7 +9,7 @@ function romanTime(time) { var m; var roman = ['N', 'I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII']; if (!time || time.length > 5) { - throw new TypeError( "Неверное время" ); + throw new TypeError('Неверное время'); } h = Number(time[0]) * 10 + Number(time[1]); m = Number(time[3]) * 10 + Number(time[4]);