From cfd48af53d21514aaf872c4b41dea6545b0539c6 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Mon, 19 Apr 2010 15:02:57 +0200 Subject: [PATCH] Nuke new.js. Update end date when using the date picker too. --- kronolith/js/kronolith.js | 10 ++++++++++ kronolith/js/new.js | 9 --------- kronolith/lib/Kronolith.php | 1 - kronolith/new.php | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 kronolith/js/new.js diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index 1586e9097..bcce5d613 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -4105,6 +4105,15 @@ KronolithCore = { Prototype.emptyFunction(); }, + /** + * Handles date selections from a date picker. + */ + datePickerHandler: function(e) + { + e.element().previous().setValue(e.memo.toString(Kronolith.conf.date_format)); + this.updateEndTime() + }, + onDrop: function(e) { var drop = e.element(), @@ -5179,3 +5188,4 @@ document.observe('DragDrop2:drag', KronolithCore.onDrag.bindAsEventListener(Kron document.observe('DragDrop2:drop', KronolithCore.onDrop.bindAsEventListener(KronolithCore)); document.observe('DragDrop2:end', KronolithCore.onDragEnd.bindAsEventListener(KronolithCore)); document.observe('DragDrop2:start', KronolithCore.onDragStart.bindAsEventListener(KronolithCore)); +document.observe('Horde_Calendar:select', KronolithCore.datePickerHandler.bindAsEventListener(KronolithCore)); diff --git a/kronolith/js/new.js b/kronolith/js/new.js deleted file mode 100644 index 8a6ae21fe..000000000 --- a/kronolith/js/new.js +++ /dev/null @@ -1,9 +0,0 @@ -var KronolithNew = { - calendarSelectHandler: function(e) - { - e.element().previous().setValue(e.memo.toString(Kronolith.conf.date_format)); - } -}; - -document.observe('Horde_Calendar:select', KronolithNew.calendarSelectHandler.bindAsEventListener(KronolithNew)); - diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index bfbef64cc..cd35a082f 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -77,7 +77,6 @@ class Kronolith Horde::addScriptFile('date/' . $datejs, 'horde'); Horde::addScriptFile('date/date.js', 'horde'); Horde::addScriptFile('kronolith.js', 'kronolith'); - Horde::addScriptFile('new.js', 'kronolith'); Horde_Ui_JsCalendar::init(); if (isset($GLOBALS['language'])) { diff --git a/kronolith/new.php b/kronolith/new.php index b5a11a589..3418d2e4e 100644 --- a/kronolith/new.php +++ b/kronolith/new.php @@ -76,7 +76,6 @@ foreach ($all_calendars as $id => $calendar) { } $title = _("Add a new event"); -Horde::addScriptFile('new.js', 'kronolith'); Horde::addScriptFile('popup.js', 'horde'); require KRONOLITH_TEMPLATES . '/common-header.inc'; require KRONOLITH_TEMPLATES . '/menu.inc'; -- 2.11.0