testing event double-display bugfix; minor code cleanups in calendar.js
parent
80de19bcda
commit
0b822a26cd
|
@ -1100,14 +1100,6 @@ $(document).ready(function(){
|
||||||
OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'settingswrapper.php'});
|
OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'settingswrapper.php'});
|
||||||
});
|
});
|
||||||
$('#fullcalendar').fullCalendar('option', 'height', $(window).height() - $('#controls').height() - $('#header').height() - 15);
|
$('#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 */
|
/* link-sharing/unsharing of single events and calendars done right */
|
||||||
$('.share-interface-container.link-share input[type="checkbox"].share-link').live('change', function(e){
|
$('.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
19
js/l10n.php
|
@ -19,14 +19,17 @@ $l = OCP\Util::getL10N('calendar');
|
||||||
|
|
||||||
// Get the event sources
|
// Get the event sources
|
||||||
$eventSources = array();
|
$eventSources = array();
|
||||||
$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
|
|
||||||
foreach($calendars as $calendar) {
|
if (OCP\User::isLoggedIn()) {
|
||||||
if(!array_key_exists('active', $calendar)){
|
$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
|
||||||
$calendar['active'] = 1;
|
foreach($calendars as $calendar) {
|
||||||
}
|
if(!array_key_exists('active', $calendar)){
|
||||||
if($calendar['active'] == 1) {
|
$calendar['active'] = 1;
|
||||||
$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
|
}
|
||||||
}
|
if($calendar['active'] == 1) {
|
||||||
|
$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');
|
$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');
|
||||||
|
|
Loading…
Reference in New Issue