Skip to content

Commit 7d72665

Browse files
author
Matt Lewis
committed
refactor: merge util files
1 parent 46d0e20 commit 7d72665

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

src/components/common/util.ts

-9
This file was deleted.

src/components/day/calendar-day-view.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { CalendarDragHelper } from '../../providers/calendar-drag-helper.provide
2626
import { CalendarResizeHelper } from '../../providers/calendar-resize-helper.provider';
2727
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
2828
import { CalendarUtils } from '../../providers/calendar-utils.provider';
29-
import { validateEvents } from '../common/util';
29+
import { validateEvents } from '../../providers/util';
3030

3131
/**
3232
* @hidden

src/components/month/calendar-month-view.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import differenceInSeconds from 'date-fns/difference_in_seconds';
3030
import addSeconds from 'date-fns/add_seconds';
3131
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
3232
import { CalendarUtils } from '../../providers/calendar-utils.provider';
33-
import { validateEvents } from '../common/util';
33+
import { validateEvents } from '../../providers/util';
3434

3535
/**
3636
* Shows all events on a given month. Example usage:

src/components/week/calendar-week-view.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import { CalendarDragHelper } from '../../providers/calendar-drag-helper.provide
2525
import { CalendarResizeHelper } from '../../providers/calendar-resize-helper.provider';
2626
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
2727
import { CalendarUtils } from '../../providers/calendar-utils.provider';
28-
import { validateEvents } from '../common/util';
28+
import { validateEvents } from '../../providers/util';
2929

3030
export interface WeekViewEventResize {
3131
originalOffset: number;

src/providers/util.ts

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
import {
2+
CalendarEvent,
3+
validateEvents as validateEventsWithoutLog
4+
} from 'calendar-utils';
5+
6+
export const validateEvents = (events: CalendarEvent[]) => {
7+
const warn = (...args) => console.warn('angular-calendar', ...args);
8+
return validateEventsWithoutLog(events, warn);
9+
};
10+
111
export function isInside(outer: ClientRect, inner: ClientRect): boolean {
212
return (
313
outer.left <= inner.left &&

0 commit comments

Comments
 (0)