rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing event double-display bugfix; minor code cleanups in calendar.js

master
Michał 'rysiek' Woźniak 2014-02-04 02:55:34 +01:00
parent 80de19bcda
commit 0b822a26cd
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/calendar.js
View File

@ -1100,14 +1100,6 @@ $(document).ready(function(){
OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'settingswrapper.php'});
});
$('#fullcalendar').fullCalendar('option', 'height', $(window).height() - $('#controls').height() - $('#header').height() - 15);
// fixing the calendar share link
// https://github.com/owncloud/apps/issues/411#issuecomment-32303184
var oldOCShareShowLink = OC.Share.showLink;
OC.Share.showLink = function () {
var r = oldOCShareShowLink.apply(this, arguments);
$('#linkText').val($('#linkText').val().replace('service=files', 'service=calendar'));
return r;
};
/* link-sharing/unsharing of single events and calendars done right */
$('.share-interface-container.link-share input[type="checkbox"].share-link').live('change', function(e){
@ -1239,7 +1231,4 @@ $(document).ready(function(){
});
}
})
/*
$('a.action').each(function(){$(this).tipsy('disable')})
*/
});

19
js/l10n.php
View File

@ -19,14 +19,17 @@ $l = OCP\Util::getL10N('calendar');
// Get the event sources
$eventSources = array();
$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
foreach($calendars as $calendar) {
if(!array_key_exists('active', $calendar)){
$calendar['active'] = 1;
}
if($calendar['active'] == 1) {
$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
}
if (OCP\User::isLoggedIn()) {
$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
foreach($calendars as $calendar) {
if(!array_key_exists('active', $calendar)){
$calendar['active'] = 1;
}
if($calendar['active'] == 1) {
$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
}
}
}
$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');