Skip to content

Commit 6c0fd8a

Browse files
IvayloGIvayloG
committed
Merge branch 'bpenkov/igx-date-range' of https://github.com/IgniteUI/igniteui-angular into bpenkov/igx-date-range
2 parents 62c400a + d08d285 commit 6c0fd8a

8 files changed

+56
-8
lines changed

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker-inputs.common.html renamed to ‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker-inputs.common.html

File renamed without changes.

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker-inputs.common.ts renamed to ‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker-inputs.common.ts

File renamed without changes.

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker.component.html renamed to ‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.html

File renamed without changes.

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker.component.spec.ts renamed to ‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IgxDateRangePickerComponent } from './igx-date-range-picker.component';
1+
import { IgxDateRangePickerComponent } from './date-range-picker.component';
22
import { ComponentFixture, async, TestBed, fakeAsync, tick } from '@angular/core/testing';
33
import { Component, OnInit, ViewChild, DebugElement } from '@angular/core';
44
import { IgxInputGroupModule } from '../input-group/index';

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker.component.ts renamed to ‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import {
3535
IgxDateRangeStartComponent,
3636
IgxPickerToggleComponent,
3737
IgxDateRangeSeparatorDirective
38-
} from './igx-date-range-picker-inputs.common';
38+
} from './date-range-picker-inputs.common';
3939
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
4040
import { IToggleView } from '../core/navigation';
4141
import { IgxLabelDirective } from '../input-group';
@@ -70,7 +70,7 @@ const DEFAULT_INPUT_FORMAT = 'MM/dd/yyyy';
7070
*/
7171
@Component({
7272
selector: 'igx-date-range-picker',
73-
templateUrl: './igx-date-range-picker.component.html',
73+
templateUrl: './date-range-picker.component.html',
7474
providers: [{ provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => IgxDateRangePickerComponent), multi: true }]
7575
})
7676
export class IgxDateRangePickerComponent extends DisplayDensityBase

‎projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.module.ts

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { NgModule } from '@angular/core';
2+
import { IgxDateRangePickerComponent } from './date-range-picker.component';
3+
import { IgxCalendarModule } from '../calendar/index';
4+
import { IgxToggleModule } from '../directives/toggle/toggle.directive';
5+
import { CommonModule } from '@angular/common';
6+
import { IgxButtonModule } from '../directives/button/button.directive';
7+
import { IgxInputGroupModule } from '../input-group/index';
8+
import { IgxIconModule } from '../icon/index';
9+
import {
10+
IgxDateRangeStartComponent, IgxDateRangeEndComponent,
11+
DateRangePickerFormatPipe,
12+
IgxDateRangeSingleComponent,
13+
IgxPickerToggleComponent,
14+
IgxDateRangeSeparatorDirective
15+
} from './date-range-picker-inputs.common';
16+
import { IgxDateTimeEditorModule } from '../directives/date-time-editor';
17+
18+
/**
19+
* @hidden
20+
*/
21+
@NgModule({
22+
declarations: [
23+
IgxDateRangePickerComponent,
24+
IgxDateRangeStartComponent,
25+
IgxDateRangeEndComponent,
26+
IgxDateRangeSingleComponent,
27+
DateRangePickerFormatPipe,
28+
IgxPickerToggleComponent,
29+
IgxDateRangeSeparatorDirective
30+
],
31+
imports: [
32+
CommonModule,
33+
IgxIconModule,
34+
IgxButtonModule,
35+
IgxToggleModule,
36+
IgxCalendarModule,
37+
IgxInputGroupModule,
38+
IgxDateTimeEditorModule
39+
],
40+
exports: [
41+
IgxDateRangePickerComponent,
42+
IgxDateRangeStartComponent,
43+
IgxDateRangeEndComponent,
44+
IgxDateRangeSeparatorDirective,
45+
IgxPickerToggleComponent
46+
]
47+
})
48+
export class IgxDateRangePickerModule { }

‎projects/igniteui-angular/src/lib/date-range-picker/igx-date-range-picker.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from '@angular/core';
2-
import { IgxDateRangePickerComponent } from './igx-date-range-picker.component';
2+
import { IgxDateRangePickerComponent } from './date-range-picker.component';
33
import { IgxCalendarModule } from '../calendar/index';
44
import { IgxToggleModule } from '../directives/toggle/toggle.directive';
55
import { CommonModule } from '@angular/common';
@@ -12,7 +12,7 @@ import {
1212
IgxDateRangeSingleComponent,
1313
IgxPickerToggleComponent,
1414
IgxDateRangeSeparatorDirective
15-
} from './igx-date-range-picker-inputs.common';
15+
} from './date-range-picker-inputs.common';
1616
import { IgxDateTimeEditorModule } from '../directives/date-time-editor';
1717

1818
/**

‎projects/igniteui-angular/src/lib/date-range-picker/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export * from './igx-date-range-picker-inputs.common';
2-
export * from './igx-date-range-picker.component';
3-
export * from './igx-date-range-picker.module';
1+
export * from './date-range-picker-inputs.common';
2+
export * from './date-range-picker.component';
3+
export * from './date-range-picker.module';

0 commit comments

Comments
 (0)