Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates Calendar color. #36

Merged
merged 2 commits into from Sep 26, 2015
Merged

Updates Calendar color. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20861a0
Updates Calendar color.
raghunayyar Sep 17, 2015
aba18e7
manually patch color for events when calendar color changed
georgehrke Sep 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions js/app/controllers/calcontroller.js
View file
Open in desktop
Expand Up @@ -287,9 +287,7 @@ app.controller('CalController', ['$scope', '$rootScope', 'Restangular', 'Calenda
// Sadly fullcalendar doesn't support changing a calendar's
// color without removing and then adding it again as an eventSource
$scope.eventSource[id].color = updatedCalendar.color;
//if (index !== -1) {
//TODO find a solution
//}
angular.element('.fcCalendar-id-' + id).css('background-color', updatedCalendar.color);
}
$scope.eventSource[id].editable = updatedCalendar.cruds.update;
});
Expand Down
1 change: 0 additions & 1 deletion js/app/controllers/calendarlistcontroller.js
View file
Open in desktop
Expand Up @@ -45,7 +45,6 @@ app.controller('CalendarListController', ['$scope', '$rootScope', '$window',
});

$scope.newCalendarInputVal = '';
$scope.selected = '';

$scope.create = function (name, color) {
calendarResource.post({
Expand Down
1 change: 1 addition & 0 deletions js/app/service/eventsmodel.js
View file
Open in desktop
Expand Up @@ -110,6 +110,7 @@ app.factory('EventsModel', ['$rootScope', 'objectConverter', function ($rootScop
fcData.color = calendar.color;
fcData.textColor = calendar.textColor;
fcData.editable = calendar.editable;
fcData.className = 'fcCalendar-id-' + calendar.id;

return fcData;
}
Expand Down
6 changes: 2 additions & 4 deletions js/public/app.js
View file
Open in desktop
Expand Up @@ -310,9 +310,7 @@ app.controller('CalController', ['$scope', '$rootScope', 'Restangular', 'Calenda
// Sadly fullcalendar doesn't support changing a calendar's
// color without removing and then adding it again as an eventSource
$scope.eventSource[id].color = updatedCalendar.color;
//if (index !== -1) {
//TODO find a solution
//}
angular.element('.fcCalendar-id-' + id).css('background-color', updatedCalendar.color);
}
$scope.eventSource[id].editable = updatedCalendar.cruds.update;
});
Expand Down Expand Up @@ -410,7 +408,6 @@ app.controller('CalendarListController', ['$scope', '$rootScope', '$window',
});

$scope.newCalendarInputVal = '';
$scope.selected = '';

$scope.create = function (name, color) {
calendarResource.post({
Expand Down Expand Up @@ -1506,6 +1503,7 @@ app.factory('EventsModel', ['$rootScope', 'objectConverter', function ($rootScop
fcData.color = calendar.color;
fcData.textColor = calendar.textColor;
fcData.editable = calendar.editable;
fcData.className = 'fcCalendar-id-' + calendar.id;

return fcData;
}
Expand Down
2 changes: 1 addition & 1 deletion templates/part.calendarlist.item.php
View file
Open in desktop
Expand Up @@ -81,7 +81,7 @@ class="icon-delete"
</fieldset>
<fieldset ng-show="calendar.list.edit" class="editfieldset">
<input class="app-navigation-input" type="text" ng-model="calendar.displayname" data-id="{{ calendar.id }}" />
<colorpicker class="colorpicker" selected="selected"></colorpicker>
<colorpicker class="colorpicker" selected="calendar.color"></colorpicker>
<div class="calendartype pull-left">
<p>
<input class="app-navigation-checkbox" type="checkbox" ng-model="calendar.components.vevent" />
Expand Down