From 6530d4aa8fa1e7865a99d2f47d74fc7c01829c0a Mon Sep 17 00:00:00 2001 From: aki Date: Mon, 15 Oct 2012 21:26:53 +0600 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A4=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=D0=BE=D0=B7?= =?UTF-8?q?=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D0=B5=D1=82=20=D0=BE=D0=B1=D1=8A?= =?UTF-8?q?=D0=B5=D0=BA=D1=82.=20=D0=9D=D0=B5=20=D0=BF=D0=BE=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=D0=B0,=20=D0=BA=D0=B0=D0=BA=20=D1=81=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D1=83=20=D1=82=D0=B8=D0=BF=D0=B0.=20=D0=9D=D1=83,=20=D1=82.?= =?UTF-8?q?=D0=B5,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=BF=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D1=80=D1=8B=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=20=D0=BD=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=B2=D0=B0=D1=82=D1=8C,=20?= =?UTF-8?q?=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=B6=D0=B5=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B2=D1=8B=D0=BB?= =?UTF-8?q?=D0=B5=D1=82=D0=B0=D1=82=D1=8C=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20=D1=82=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BA=D0=B0?= =?UTF-8?q?=D0=BA=D0=BE=D0=B5-=D1=82=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE?= =?UTF-8?q?=D0=BB=D1=87=D0=B0=D0=BD=D0=B8=D1=8E=20=D0=BF=D1=80=D0=B8=D1=81?= =?UTF-8?q?=D0=B2=D0=BE=D0=B8=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- event.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 event.js diff --git a/event.js b/event.js new file mode 100644 index 0000000..8286cf5 --- /dev/null +++ b/event.js @@ -0,0 +1,25 @@ +/** + * Возвращает объект Event + * + * @param {Number|Date} start Начало события + * @param {Number|Date} end Конец события + * @param {String} [name="Событие"] Имя события + * @param {String} [description="Описание"] Описание события + * @param {Boolean} alarm Нужно ли напоминание + * + * @example + * Event(new Date('2011-10-10T14:48:00'), + * new Date('2011-10-10T15:48:00'), + * "Совещание") + * + * @return {Object} + */ +function Event(start, end, name, description, alarm) { + return { + "start": +start, + "end": +end, + "name": name || "Событие", + "description": description || "Описание", + "alarm": alarm || false + }; +} From 1501b45364dd55ca08969ec1eeb431f79352dd08 Mon Sep 17 00:00:00 2001 From: aki Date: Tue, 16 Oct 2012 20:06:02 +0600 Subject: [PATCH 2/4] =?UTF-8?q?+=20=D0=BC=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C?= =?UTF-8?q?=D0=BA=D0=B0=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=B9=20=D0=B8=D0=B7=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- event.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/event.js b/event.js index 8286cf5..f153c45 100644 --- a/event.js +++ b/event.js @@ -1,11 +1,11 @@ /** * Возвращает объект Event * - * @param {Number|Date} start Начало события - * @param {Number|Date} end Конец события - * @param {String} [name="Событие"] Имя события + * @param {Number|Date} start Начало события + * @param {Number|Date} end Конец события + * @param {String} [name="Событие"] Имя события * @param {String} [description="Описание"] Описание события - * @param {Boolean} alarm Нужно ли напоминание + * @param {Boolean} [alarm=false] Нужно ли напоминание * * @example * Event(new Date('2011-10-10T14:48:00'), @@ -15,11 +15,16 @@ * @return {Object} */ function Event(start, end, name, description, alarm) { + if (typeof(alarm) === "boolean") { + var new_alarm = alarm; + } else { + var new_alarm = false; + } return { "start": +start, "end": +end, "name": name || "Событие", "description": description || "Описание", - "alarm": alarm || false + "alarm": new_alarm }; } From a455f0965b51483932edb1d74297a6c9fcfc25c1 Mon Sep 17 00:00:00 2001 From: aki Date: Wed, 17 Oct 2012 17:28:37 +0600 Subject: [PATCH 3/4] + rating --- event.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/event.js b/event.js index f153c45..c75e616 100644 --- a/event.js +++ b/event.js @@ -5,6 +5,7 @@ * @param {Number|Date} end Конец события * @param {String} [name="Событие"] Имя события * @param {String} [description="Описание"] Описание события + * @param {Number} [number=1] Рейтинг события * @param {Boolean} [alarm=false] Нужно ли напоминание * * @example @@ -14,17 +15,25 @@ * * @return {Object} */ -function Event(start, end, name, description, alarm) { +function Event(start, end, name, description, rating, alarm) { if (typeof(alarm) === "boolean") { var new_alarm = alarm; } else { var new_alarm = false; } + if ((typeof(rating) === "number")) { + if (rating > 5 || rating < 1) { + var new_rating = 1; + } else { + var new_rating = rating; + } + } return { "start": +start, "end": +end, "name": name || "Событие", "description": description || "Описание", + "rating": new_rating, "alarm": new_alarm }; } From 0bdbdb362960fd1ecd09e64ac65b24ddf6b01048 Mon Sep 17 00:00:00 2001 From: aki Date: Thu, 18 Oct 2012 21:51:21 +0600 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BA=D0=BE=D0=B1?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- event.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/event.js b/event.js index c75e616..4fd0790 100644 --- a/event.js +++ b/event.js @@ -21,7 +21,7 @@ function Event(start, end, name, description, rating, alarm) { } else { var new_alarm = false; } - if ((typeof(rating) === "number")) { + if (typeof(rating) === "number") { if (rating > 5 || rating < 1) { var new_rating = 1; } else {