Skip to content

Commit 46d0e20

Browse files
author
Matt Lewis
committed
chore: merge with master
2 parents 194fe59 + f3519c1 commit 46d0e20

40 files changed

+54
-54
lines changed

‎src/calendar.module.ts

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@ import {
55
DragAndDropModule,
66
DraggableHelper
77
} from 'angular-draggable-droppable';
8-
import { CalendarDayViewComponent } from './components/day/calendarDayView.component';
9-
import { CalendarWeekViewComponent } from './components/week/calendarWeekView.component';
10-
import { CalendarMonthViewComponent } from './components/month/calendarMonthView.component';
11-
import { CalendarMonthViewHeaderComponent } from './components/month/calendarMonthViewHeader.component';
12-
import { CalendarEventActionsComponent } from './components/common/calendarEventActions.component';
13-
import { CalendarEventTitleComponent } from './components/common/calendarEventTitle.component';
14-
import { CalendarMonthCellComponent } from './components/month/calendarMonthCell.component';
15-
import { CalendarOpenDayEventsComponent } from './components/month/calendarOpenDayEvents.component';
16-
import { CalendarWeekViewHeaderComponent } from './components/week/calendarWeekViewHeader.component';
17-
import { CalendarWeekViewEventComponent } from './components/week/calendarWeekViewEvent.component';
18-
import { CalendarAllDayEventComponent } from './components/day/calendarAllDayEvent.component';
19-
import { CalendarDayViewHourSegmentComponent } from './components/day/calendarDayViewHourSegment.component';
20-
import { CalendarDayViewEventComponent } from './components/day/calendarDayViewEvent.component';
8+
import { CalendarDayViewComponent } from './components/day/calendar-day-view.component';
9+
import { CalendarWeekViewComponent } from './components/week/calendar-week-view.component';
10+
import { CalendarMonthViewComponent } from './components/month/calendar-month-view.component';
11+
import { CalendarMonthViewHeaderComponent } from './components/month/calendar-month-view-header.component';
12+
import { CalendarEventActionsComponent } from './components/common/calendar-event-actions.component';
13+
import { CalendarEventTitleComponent } from './components/common/calendar-event-title.component';
14+
import { CalendarMonthCellComponent } from './components/month/calendar-month-cell.component';
15+
import { CalendarOpenDayEventsComponent } from './components/month/calendar-open-day-events.component';
16+
import { CalendarWeekViewHeaderComponent } from './components/week/calendar-week-view-header.component';
17+
import { CalendarWeekViewEventComponent } from './components/week/calendar-week-view-event.component';
18+
import { CalendarAllDayEventComponent } from './components/day/calendar-all-day-event.component';
19+
import { CalendarDayViewHourSegmentComponent } from './components/day/calendar-day-view-hour-segment.component';
20+
import { CalendarDayViewEventComponent } from './components/day/calendar-day-view-event.component';
2121
import {
2222
CalendarTooltipWindowComponent,
2323
CalendarTooltipDirective
24-
} from './directives/calendarTooltip.directive';
25-
import { CalendarPreviousViewDirective } from './directives/calendarPreviousView.directive';
26-
import { CalendarNextViewDirective } from './directives/calendarNextView.directive';
27-
import { CalendarTodayDirective } from './directives/calendarToday.directive';
24+
} from './directives/calendar-tooltip.directive';
25+
import { CalendarPreviousViewDirective } from './directives/calendar-previous-view.directive';
26+
import { CalendarNextViewDirective } from './directives/calendar-next-view.directive';
27+
import { CalendarTodayDirective } from './directives/calendar-today.directive';
2828
import { ClickDirective } from './directives/click.directive';
29-
import { CalendarDatePipe } from './pipes/calendarDate.pipe';
30-
import { CalendarEventTitlePipe } from './pipes/calendarEventTitle.pipe';
31-
import { CalendarEventTitleFormatter } from './providers/calendarEventTitleFormatter.provider';
32-
import { CalendarDateFormatter } from './providers/calendarDateFormatter.provider';
33-
import { CalendarUtils } from './providers/calendarUtils.provider';
29+
import { CalendarDatePipe } from './pipes/calendar-date.pipe';
30+
import { CalendarEventTitlePipe } from './pipes/calendar-event-title.pipe';
31+
import { CalendarEventTitleFormatter } from './providers/calendar-event-title-formatter.provider';
32+
import { CalendarDateFormatter } from './providers/calendar-date-formatter.provider';
33+
import { CalendarUtils } from './providers/calendar-utils.provider';
3434

3535
export interface CalendarModuleConfig {
3636
eventTitleFormatter?: Provider;

‎src/components/common/calendarEventActions.component.ts renamed to ‎src/components/common/calendar-event-actions.component.ts

File renamed without changes.

‎src/components/common/calendarEventTitle.component.ts renamed to ‎src/components/common/calendar-event-title.component.ts

File renamed without changes.

‎src/components/day/calendarAllDayEvent.component.ts renamed to ‎src/components/day/calendar-all-day-event.component.ts

File renamed without changes.

‎src/components/day/calendarDayViewEvent.component.ts renamed to ‎src/components/day/calendar-day-view-event.component.ts

File renamed without changes.

‎src/components/day/calendarDayViewHourSegment.component.ts renamed to ‎src/components/day/calendar-day-view-hour-segment.component.ts

File renamed without changes.

‎src/components/day/calendarDayView.component.ts renamed to ‎src/components/day/calendar-day-view.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import { Subject } from 'rxjs/Subject';
2222
import { Subscription } from 'rxjs/Subscription';
2323
import { ResizeEvent } from 'angular-resizable-element';
2424
import addMinutes from 'date-fns/add_minutes';
25-
import { CalendarDragHelper } from '../../providers/calendarDragHelper.provider';
26-
import { CalendarResizeHelper } from '../../providers/calendarResizeHelper.provider';
27-
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendarEventTimesChangedEvent.interface';
28-
import { CalendarUtils } from '../../providers/calendarUtils.provider';
25+
import { CalendarDragHelper } from '../../providers/calendar-drag-helper.provider';
26+
import { CalendarResizeHelper } from '../../providers/calendar-resize-helper.provider';
27+
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
28+
import { CalendarUtils } from '../../providers/calendar-utils.provider';
2929
import { validateEvents } from '../common/util';
3030

3131
/**

‎src/components/month/calendarMonthCell.component.ts renamed to ‎src/components/month/calendar-month-cell.component.ts

File renamed without changes.

‎src/components/month/calendarMonthViewHeader.component.ts renamed to ‎src/components/month/calendar-month-view-header.component.ts

File renamed without changes.

‎src/components/month/calendarMonthView.component.ts renamed to ‎src/components/month/calendar-month-view.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import getMonth from 'date-fns/get_month';
2828
import getYear from 'date-fns/get_year';
2929
import differenceInSeconds from 'date-fns/difference_in_seconds';
3030
import addSeconds from 'date-fns/add_seconds';
31-
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendarEventTimesChangedEvent.interface';
32-
import { CalendarUtils } from '../../providers/calendarUtils.provider';
31+
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
32+
import { CalendarUtils } from '../../providers/calendar-utils.provider';
3333
import { validateEvents } from '../common/util';
3434

3535
/**

‎src/components/month/calendarOpenDayEvents.component.ts renamed to ‎src/components/month/calendar-open-day-events.component.ts

File renamed without changes.

‎src/components/week/calendarWeekViewEvent.component.ts renamed to ‎src/components/week/calendar-week-view-event.component.ts

File renamed without changes.

‎src/components/week/calendarWeekViewHeader.component.ts renamed to ‎src/components/week/calendar-week-view-header.component.ts

File renamed without changes.

‎src/components/week/calendarWeekView.component.ts renamed to ‎src/components/week/calendar-week-view.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import {
2121
} from 'calendar-utils';
2222
import { ResizeEvent } from 'angular-resizable-element';
2323
import addDays from 'date-fns/add_days';
24-
import { CalendarDragHelper } from '../../providers/calendarDragHelper.provider';
25-
import { CalendarResizeHelper } from '../../providers/calendarResizeHelper.provider';
26-
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendarEventTimesChangedEvent.interface';
27-
import { CalendarUtils } from '../../providers/calendarUtils.provider';
24+
import { CalendarDragHelper } from '../../providers/calendar-drag-helper.provider';
25+
import { CalendarResizeHelper } from '../../providers/calendar-resize-helper.provider';
26+
import { CalendarEventTimesChangedEvent } from '../../interfaces/calendar-event-times-changed-event.interface';
27+
import { CalendarUtils } from '../../providers/calendar-utils.provider';
2828
import { validateEvents } from '../common/util';
2929

3030
export interface WeekViewEventResize {

‎src/directives/calendarNextView.directive.ts renamed to ‎src/directives/calendar-next-view.directive.ts

File renamed without changes.

‎src/directives/calendarPreviousView.directive.ts renamed to ‎src/directives/calendar-previous-view.directive.ts

File renamed without changes.

‎src/directives/calendarToday.directive.ts renamed to ‎src/directives/calendar-today.directive.ts

File renamed without changes.

‎src/directives/calendarTooltip.directive.ts renamed to ‎src/directives/calendar-tooltip.directive.ts

File renamed without changes.

‎src/index.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
export * from './providers/calendarEventTitleFormatter.provider';
2-
export * from './providers/calendarMomentDateFormatter.provider';
3-
export * from './providers/calendarNativeDateFormatter.provider';
4-
export * from './providers/calendarDateFormatter.provider';
5-
export * from './providers/calendarUtils.provider';
6-
export * from './interfaces/calendarDateFormatter.interface';
7-
export * from './interfaces/calendarEventTimesChangedEvent.interface';
1+
export * from './providers/calendar-event-title-formatter.provider';
2+
export * from './providers/calendar-moment-date-formatter.provider';
3+
export * from './providers/calendar-native-date-formatter.provider';
4+
export * from './providers/calendar-date-formatter.provider';
5+
export * from './providers/calendar-utils.provider';
6+
export * from './interfaces/calendar-date-formatter.interface';
7+
export * from './interfaces/calendar-event-times-changed-event.interface';
88
export * from './calendar.module';
9-
export * from './components/day/calendarDayView.component';
10-
export * from './components/month/calendarMonthView.component';
11-
export * from './components/week/calendarWeekView.component';
9+
export * from './components/day/calendar-day-view.component';
10+
export * from './components/month/calendar-month-view.component';
11+
export * from './components/week/calendar-week-view.component';
1212
export {
1313
CalendarEvent,
1414
EventAction as CalendarEventAction,

‎src/interfaces/calendarDateFormatter.interface.ts renamed to ‎src/interfaces/calendar-date-formatter.interface.ts

File renamed without changes.

‎src/interfaces/calendarEventTimesChangedEvent.interface.ts renamed to ‎src/interfaces/calendar-event-times-changed-event.interface.ts

File renamed without changes.

‎src/pipes/calendarDate.pipe.ts renamed to ‎src/pipes/calendar-date.pipe.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Pipe, PipeTransform, LOCALE_ID, Inject } from '@angular/core';
2-
import { CalendarDateFormatter } from './../providers/calendarDateFormatter.provider';
2+
import { CalendarDateFormatter } from '../providers/calendar-date-formatter.provider';
33

44
/**
55
* This pipe is primarily for rendering the current view title. Example usage:

‎src/pipes/calendarEventTitle.pipe.ts renamed to ‎src/pipes/calendar-event-title.pipe.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Pipe, PipeTransform } from '@angular/core';
22
import { CalendarEvent } from 'calendar-utils';
3-
import { CalendarEventTitleFormatter } from '../providers/calendarEventTitleFormatter.provider';
3+
import { CalendarEventTitleFormatter } from '../providers/calendar-event-title-formatter.provider';
44

55
@Pipe({
66
name: 'calendarEventTitle'

‎src/providers/calendarDateFormatter.provider.ts renamed to ‎src/providers/calendar-date-formatter.provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CalendarNativeDateFormatter } from './calendarNativeDateFormatter.provider';
1+
import { CalendarNativeDateFormatter } from './calendar-native-date-formatter.provider';
22

33
/**
44
* This class is responsible for all formatting of dates. There are 2 implementations available, the `CalendarNativeDateFormatter` (default) which will use the <a href="https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Intl" target="_blank">Intl</a> API to format dates, or there is the `CalendarMomentDateFormatter` which uses <a href="http://momentjs.com/" target="_blank">moment</a>.

‎src/providers/calendarDragHelper.provider.ts renamed to ‎src/providers/calendar-drag-helper.provider.ts

File renamed without changes.

‎src/providers/calendarEventTitleFormatter.provider.ts renamed to ‎src/providers/calendar-event-title-formatter.provider.ts

File renamed without changes.

‎src/providers/calendarMomentDateFormatter.provider.ts renamed to ‎src/providers/calendar-moment-date-formatter.provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { InjectionToken, Inject } from '@angular/core';
22
import {
33
CalendarDateFormatterInterface,
44
DateFormatterParams
5-
} from '../interfaces/calendarDateFormatter.interface';
5+
} from '../interfaces/calendar-date-formatter.interface';
66

77
export const MOMENT: InjectionToken<string> = new InjectionToken('Moment');
88

‎src/providers/calendarNativeDateFormatter.provider.ts renamed to ‎src/providers/calendar-native-date-formatter.provider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
22
CalendarDateFormatterInterface,
33
DateFormatterParams
4-
} from './../interfaces/calendarDateFormatter.interface';
4+
} from './../interfaces/calendar-date-formatter.interface';
55
import getISOWeek from 'date-fns/get_iso_week';
66

77
/**

‎src/providers/calendarResizeHelper.provider.ts renamed to ‎src/providers/calendar-resize-helper.provider.ts

File renamed without changes.

‎src/providers/calendarUtils.provider.ts renamed to ‎src/providers/calendar-utils.provider.ts

File renamed without changes.

‎test/calendarDate.pipe.spec.ts renamed to ‎test/calendar-date.pipe.spec.ts

File renamed without changes.

‎test/calendarDayView.component.spec.ts renamed to ‎test/calendar-day-view.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import {
1717
CalendarDateFormatter,
1818
CalendarModule,
1919
MOMENT,
20-
CalendarEventTimesChangedEvent
20+
CalendarEventTimesChangedEvent,
21+
CalendarDayViewComponent
2122
} from './../src';
22-
import { CalendarDayViewComponent } from './../src/components/day/calendarDayView.component';
2323
import { Subject } from 'rxjs/Rx';
2424
import { spy } from 'sinon';
2525
import { triggerDomEvent, ExternalEventComponent } from './util';

‎test/calendarModule.spec.ts renamed to ‎test/calendar-module.spec.ts

File renamed without changes.

‎test/calendarMomentDateFormatter.provider.spec.ts renamed to ‎test/calendar-moment-date-formatter.provider.spec.ts

File renamed without changes.

‎test/calendarMonthView.component.spec.ts renamed to ‎test/calendar-month-view.component.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import {
1818
CalendarModule,
1919
MOMENT,
2020
CalendarMonthViewDay,
21-
DAYS_OF_WEEK
21+
DAYS_OF_WEEK,
22+
CalendarEventTimesChangedEvent,
23+
CalendarMonthViewComponent
2224
} from './../src';
23-
import { CalendarMonthViewComponent } from './../src/components/month/calendarMonthView.component';
2425
import { Subject } from 'rxjs/Subject';
2526
import { triggerDomEvent } from './util';
26-
import { CalendarEventTimesChangedEvent } from '../src/interfaces/calendarEventTimesChangedEvent.interface';
2727

2828
describe('calendarMonthView component', () => {
2929
beforeEach(() => {

‎test/calendarNativeDateFormatter.provider.spec.ts renamed to ‎test/calendar-native-date-formatter.provider.spec.ts

File renamed without changes.

‎test/calendarNextView.directive.spec.ts renamed to ‎test/calendar-next-view.directive.spec.ts

File renamed without changes.

‎test/calendarPreviousView.directive.spec.ts renamed to ‎test/calendar-previous-view.directive.spec.ts

File renamed without changes.

‎test/calendarToday.directive.spec.ts renamed to ‎test/calendar-today.directive.spec.ts

File renamed without changes.

‎test/calendarWeekView.component.spec.ts renamed to ‎test/calendar-week-view.component.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import {
1515
CalendarModule,
1616
MOMENT,
1717
CalendarEventTimesChangedEvent,
18-
DAYS_OF_WEEK
18+
DAYS_OF_WEEK,
19+
CalendarWeekViewComponent
1920
} from '../src';
20-
import { CalendarWeekViewComponent } from '../src/components/week/calendarWeekView.component';
2121
import { DragAndDropModule } from 'angular-draggable-droppable';
2222
import { Subject } from 'rxjs/Subject';
2323
import * as sinon from 'sinon';

0 commit comments

Comments
 (0)