Skip to content

Commit

Permalink
Fixed #1825
Browse files Browse the repository at this point in the history
  • Loading branch information
Çağatay Çivici committed Jan 17, 2017
1 parent 7ae654b commit 4bed540
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions components/schedule/schedule.ts
Expand Up @@ -107,8 +107,8 @@ export class Schedule implements DoCheck,OnDestroy,OnInit,AfterViewChecked {

@Output() onEventResize: EventEmitter<any> = new EventEmitter();

@Output() viewRender: EventEmitter<any> = new EventEmitter();

@Output() onViewRender: EventEmitter<any> = new EventEmitter();
initialized: boolean;

stopNgOnChangesPropagation: boolean;
Expand Down Expand Up @@ -161,9 +161,6 @@ export class Schedule implements DoCheck,OnDestroy,OnInit,AfterViewChecked {
eventConstraint: this.eventConstraint,
eventRender: this.eventRender,
dayRender: this.dayRender,
events: (start, end, timezone, callback) => {
callback(this.events);
},
dayClick: (date, jsEvent, view) => {
this.onDayClick.emit({
'date': date,
Expand Down Expand Up @@ -246,7 +243,7 @@ export class Schedule implements DoCheck,OnDestroy,OnInit,AfterViewChecked {
});
},
viewRender: (view, element) => {
this.viewRender.emit({
this.onViewRender.emit({
'view': view,
'element': element
});
Expand Down Expand Up @@ -276,9 +273,12 @@ export class Schedule implements DoCheck,OnDestroy,OnInit,AfterViewChecked {
let changes = this.differ.diff(this.events);

if(this.schedule && changes) {
this.schedule.fullCalendar('refetchEvents');
this.schedule.fullCalendar('removeEventSources');
this.schedule.fullCalendar('addEventSource', this.events);
}
}



ngOnDestroy() {
jQuery(this.el.nativeElement.children[0]).fullCalendar('destroy');
Expand Down
4 changes: 2 additions & 2 deletions index.html
Expand Up @@ -30,7 +30,7 @@
<link rel="stylesheet" type="text/css" href="resources/themes/omega/theme.css">
<link rel="stylesheet" type="text/css" href="showcase/resources/icons/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="showcase/resources/css/prism.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.7.2/fullcalendar.min.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/fullcalendar.min.css">
<link rel="stylesheet" type="text/css" href="https://cdn.quilljs.com/1.0.0-beta.3/quill.snow.css">
<link rel="stylesheet" type="text/css" href="resources/primeng.min.css">
<link rel="stylesheet" type="text/css" href="showcase/resources/css/site.css">
Expand All @@ -46,7 +46,7 @@

<!-- Schedule -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/2.7.2/fullcalendar.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/fullcalendar/3.1.0/fullcalendar.min.js"></script>

<!-- Editor -->
<script src="https://cdn.quilljs.com/1.0.0-beta.3/quill.min.js"></script>
Expand Down

0 comments on commit 4bed540

Please sign in to comment.