Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2011-09-24 00:22:03 +0400
committerBart Visscher <bartv@thisnet.nl>2011-09-24 00:22:03 +0400
commit5741811d3662db44d1eeab3da09d545baa32d6d9 (patch)
tree12d963d089f64153e091fb78e7645a97c8a84dac /apps/calendar
parent6e46bd73733e9b7168ba08f8d8edfcf5a92ead60 (diff)
Fix use of reserved javascript keyword 'new'
Diffstat (limited to 'apps/calendar')
-rw-r--r--apps/calendar/js/calendar.js2
-rw-r--r--apps/calendar/templates/part.choosecalendar.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 8c1a4afac09..e7217006ec8 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 0081fb08063..9495e7192bb 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>