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

Adjust code to use OC.Tags

master
Thomas Tanghus 2013-10-04 19:07:49 +02:00
parent 63900fe5ba
commit cf632410c4
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@ -38,7 +38,7 @@ OCP\Util::addStyle('calendar', 'style');
OCP\Util::addscript('', 'jquery.multiselect');
OCP\Util::addStyle('', 'jquery.multiselect');
OCP\Util::addscript('calendar','jquery.multi-autocomplete');
OCP\Util::addscript('','oc-vcategories');
OCP\Util::addscript('','tags');
OCP\Util::addscript('calendar','on-event');
OCP\App::setActiveNavigationEntry('calendar_index');
$tmpl = new OCP\Template('calendar', 'calendar', 'user');

12
js/calendar.js
View File

@ -438,7 +438,7 @@ Calendar={
$('#'+id).addClass('active');
},
categoriesChanged:function(newcategories){
categories = $.map(newcategories, function(v) {return v;});
categories = $.map(newcategories, function(v) {return v.name;});
console.log('Calendar categories changed to: ' + categories);
$('#category').multiple_autocomplete('option', 'source', categories);
},
@ -947,9 +947,13 @@ $(document).ready(function(){
}
});
fillWindow($('#content'));
OCCategories.changed = Calendar.UI.categoriesChanged;
OCCategories.app = 'calendar';
OCCategories.type = 'event';
$(OC.Tags).on('change', function(event, data) {
if(data.type === 'event') {
Calendar.UI.categoriesChanged(data.tags);
}
});
$('#oneweekview_radio').click(function(){
$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
});

2
js/on-event.js
View File

@ -8,7 +8,7 @@ $('#caldav_url').live('mouseover', function () {
$('#caldav_url').select();
});
$('#editCategories').live('click', function () {
$(this).tipsy('hide');OCCategories.edit();
$(this).tipsy('hide');OC.Tags.edit('event');
});
$('#allday_checkbox').live('click', function () {
Calendar.UI.lockTime();

4
lib/app.php
View File

@ -157,7 +157,11 @@ class OC_Calendar_App{
* @return (array) $categories
*/
public static function getCategoryOptions() {
$getNames = function($tag) {
return $tag['name'];
};
$categories = self::getVCategories()->getTags();
$categories = array_map($getNames, $categories);
return $categories;
}