Fix use of reserved javascript keyword 'new'

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 8c1a4afac098a6732f22a039d25cf81f65c56905..e7217006ec82b5706950c9b29956f9456a6e86bc 100644 (file)
--- 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 0081fb080632fa2ef6ca8816fa76688c8203b342..9495e7192bbcc475c9cf872fc42ee47053e45fe0 100644 (file)
--- 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>