From 5741811d3662db44d1eeab3da09d545baa32d6d9 Mon Sep 17 00:00:00 2001 From: Bart Visscher <bartv@thisnet.nl> Date: Fri, 23 Sep 2011 22:22:03 +0200 Subject: [PATCH] Fix use of reserved javascript keyword 'new' --- apps/calendar/js/calendar.js | 2 +- apps/calendar/templates/part.choosecalendar.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 8c1a4afac0..e7217006ec 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -459,7 +459,7 @@ Calendar={ Calendar.UI.loadEvents(); }); }, - new:function(object){ + newCalendar:function(object){ var tr = $(document.createElement('tr')) .load(oc_webroot + "/apps/calendar/ajax/newcalendar.php"); $(object).closest('tr').after(tr).hide(); diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php index 0081fb0806..9495e7192b 100644 --- a/apps/calendar/templates/part.choosecalendar.php +++ b/apps/calendar/templates/part.choosecalendar.php @@ -12,7 +12,7 @@ for($i = 0; $i < count($option_calendars); $i++){ ?> <tr> <td colspan="4"> - <a href="#" onclick="Calendar.UI.Calendar.new(this);"><?php echo $l->t('New Calendar') ?></a> + <a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><?php echo $l->t('New Calendar') ?></a> </td> </tr> <tr> -- GitLab