-
Notifications
You must be signed in to change notification settings - Fork 600
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '24_2' into grids/cardview/draft
- Loading branch information
Showing
163 changed files
with
6,118 additions
and
3,235 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
-199 Bytes
(100%)
apps/demos/testing/etalons/Gantt-FilterRow (fluent.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-89 Bytes
(100%)
apps/demos/testing/etalons/Gantt-FilterRow (material.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+189 Bytes
(100%)
apps/demos/testing/etalons/Scheduler-Adaptability (fluent.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-750 Bytes
(98%)
apps/demos/testing/etalons/Scheduler-Adaptability (material.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+63 Bytes
(100%)
.../testing/etalons/Scheduler-LimitAppointmentCountPerCell (fluent.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-296 Bytes
(100%)
...esting/etalons/Scheduler-LimitAppointmentCountPerCell (material.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9 Bytes
(100%)
apps/demos/testing/etalons/Scheduler-LimitAppointmentCountPerCell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-21 Bytes
(100%)
...heduler/etalons/scheduler_custom-dnd_list_all-day-panel (fluent.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-93 Bytes
(100%)
...duler/etalons/scheduler_custom-dnd_list_all-day-panel (material.blue.light).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; | ||
import Pager from 'devextreme-testcafe-models/pager'; | ||
import url from '../../helpers/getPageUrl'; | ||
import { testAccessibility, Configuration } from '../../helpers/accessibility/test'; | ||
import { Options } from '../../helpers/generateOptionMatrix'; | ||
|
||
fixture.disablePageReloads`Pager` | ||
.page(url(__dirname, '../container.html')); | ||
|
||
const options: Options<any> = { | ||
// disabled: [true, false], //not supported | ||
displayMode: ['full', 'compact'], | ||
infoText: [undefined, 'Total {2} items. Page {0} of {1}'], | ||
pageCount: [10, 100], | ||
pageSizes: [[1, 2, 3], [3, 6, 9]], | ||
showInfo: [true, false], | ||
showNavigationButtons: [true, false], | ||
showPageSizeSelector: [true, false], | ||
visible: [true], | ||
}; | ||
|
||
const defaultCreated = async (): Promise<void> => {}; | ||
const created = async (t: TestController, optionConfiguration): Promise<void> => { | ||
const { | ||
visible, | ||
displayMode, | ||
infoText, | ||
pageCount, | ||
pageSizes, | ||
showInfo, | ||
showNavigationButtons, | ||
showPageSizeSelector, | ||
} = optionConfiguration; | ||
|
||
if (!visible) { | ||
return; | ||
} | ||
|
||
const { takeScreenshot, compareResults } = createScreenshotsComparer(t); | ||
const pager = new Pager('#container'); | ||
await t | ||
.expect(await takeScreenshot(`pager-dm_${displayMode}-` | ||
+ `${infoText ? 'has' : 'has_no'}_it-` | ||
+ `pc_${pageCount}-` | ||
+ `ps_${pageSizes[0]}_${pageSizes[1]}_${pageSizes[2]}-` | ||
+ `si_${showInfo.toString()}-` | ||
+ `snb_${showNavigationButtons.toString()}-` | ||
+ `spss_${showPageSizeSelector.toString()}` | ||
+ '.png', pager.element)) | ||
.ok() | ||
.expect(compareResults.isValid()) | ||
.ok(compareResults.errorMessages()); | ||
}; | ||
|
||
const a11yCheckConfig = { | ||
// NOTE: color-contrast issues | ||
rules: { 'color-contrast': { enabled: false } }, | ||
}; | ||
|
||
const configuration: Configuration = { | ||
component: 'dxPager', | ||
a11yCheckConfig, | ||
options, | ||
created: defaultCreated || created, // Waiting pager specification | ||
}; | ||
|
||
testAccessibility(configuration); |
Binary file modified
BIN
-389 Bytes
(98%)
...e-devextreme/tests/scheduler/appointments/etalons/adaptive_appts_view-month.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-389 Bytes
(98%)
...fe-devextreme/tests/scheduler/appointments/etalons/adaptive_appts_view-week.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-379 Bytes
(99%)
...er/appointments/etalons/adaptive_long-appts-without-all-day-panel_view-week.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-320 Bytes
(97%)
...maxAppointmentsPerCell/etalons/all-day-appointment-maxAppointmentsPerCell=1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-54 Bytes
(100%)
...maxAppointmentsPerCell/etalons/all-day-appointment-maxAppointmentsPerCell=3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-225 Bytes
(98%)
...AppointmentsPerCell/etalons/all-day-appointment-maxAppointmentsPerCell=auto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+40 Bytes
(100%)
...ts/maxAppointmentsPerCell/etalons/day-appointment-maxAppointmentsPerCell=10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+5 Bytes
(100%)
...nts/maxAppointmentsPerCell/etalons/day-appointment-maxAppointmentsPerCell=3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+60 Bytes
(100%)
.../maxAppointmentsPerCell/etalons/day-appointment-maxAppointmentsPerCell=auto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-199 Bytes
(99%)
...s/maxAppointmentsPerCell/etalons/month-appointment-maxAppointmentsPerCell=1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-131 Bytes
(100%)
...s/maxAppointmentsPerCell/etalons/month-appointment-maxAppointmentsPerCell=3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-131 Bytes
(100%)
...axAppointmentsPerCell/etalons/month-appointment-maxAppointmentsPerCell=auto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-102 Bytes
(100%)
...axAppointmentsPerCell/etalons/timeline-appointment-maxAppointmentsPerCell=1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-36 Bytes
(100%)
...xAppointmentsPerCell/etalons/timeline-appointment-maxAppointmentsPerCell=10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-12 Bytes
(100%)
...axAppointmentsPerCell/etalons/timeline-appointment-maxAppointmentsPerCell=3.png
Oops, something went wrong.
Binary file modified
BIN
-36 Bytes
(100%)
...ppointmentsPerCell/etalons/timeline-appointment-maxAppointmentsPerCell=auto.png
Oops, something went wrong.
Binary file modified
BIN
-19 Bytes
(100%)
...s/maxAppointmentsPerCell/etalons/week-appointment-maxAppointmentsPerCell=10.png
Oops, something went wrong.
Binary file modified
BIN
-23 Bytes
(100%)
...ts/maxAppointmentsPerCell/etalons/week-appointment-maxAppointmentsPerCell=3.png
Oops, something went wrong.
Binary file modified
BIN
-351 Bytes
(99%)
...maxAppointmentsPerCell/etalons/week-appointment-maxAppointmentsPerCell=auto.png
Oops, something went wrong.
Binary file modified
BIN
-170 Bytes
(100%)
...p/outlookDragging/etalons/drag-n-drop-'Appointment 3'-from-tooltip-in-month.png
Oops, something went wrong.
Binary file modified
BIN
-11 Bytes
(100%)
...op/outlookDragging/etalons/drag-n-drop-'Appointment 3'-from-tooltip-in-week.png
Oops, something went wrong.
Binary file modified
BIN
+47 Bytes
(100%)
...ayout/adaptive/etalons/fluent-view=week-crossScrolling=false-horizontal-rtl.png
Oops, something went wrong.
Binary file modified
BIN
+33 Bytes
(100%)
...er/layout/adaptive/etalons/fluent-view=week-crossScrolling=false-horizontal.png
Oops, something went wrong.
Binary file modified
BIN
-983 Bytes
(98%)
...heduler/layout/adaptive/etalons/generic-view=month-crossScrolling=false-rtl.png
Oops, something went wrong.
Binary file modified
BIN
-1.02 KB
(98%)
...s/scheduler/layout/adaptive/etalons/generic-view=month-crossScrolling=false.png
Oops, something went wrong.
Binary file modified
BIN
-48 Bytes
(100%)
...cheduler/layout/adaptive/etalons/generic-view=month-crossScrolling=true-rtl.png
Oops, something went wrong.
Binary file modified
BIN
-172 Bytes
(100%)
...ts/scheduler/layout/adaptive/etalons/generic-view=month-crossScrolling=true.png
Oops, something went wrong.
Binary file modified
BIN
-21 Bytes
(100%)
...yout/adaptive/etalons/generic-view=week-crossScrolling=false-horizontal-rtl.png
Oops, something went wrong.
Binary file modified
BIN
-98 Bytes
(100%)
...r/layout/adaptive/etalons/generic-view=week-crossScrolling=false-horizontal.png
Oops, something went wrong.
Binary file modified
BIN
-147 Bytes
(99%)
...out/adaptive/etalons/material-view=week-crossScrolling=false-horizontal-rtl.png
Oops, something went wrong.
Binary file modified
BIN
-56 Bytes
(100%)
.../layout/adaptive/etalons/material-view=week-crossScrolling=false-horizontal.png
Oops, something went wrong.
Binary file modified
BIN
-121 Bytes
(100%)
...ayout/adaptive/resize/etalons/browser-resize-currentView=month-after-resize.png
Oops, something went wrong.
Binary file modified
BIN
-194 Bytes
(100%)
...yout/adaptive/resize/etalons/browser-resize-currentView=month-before-resize.png
Oops, something went wrong.
Binary file modified
BIN
-31 Bytes
(100%)
...ayout/appointments/etalons/appointment-collector-adaptability-timelineMonth.png
Oops, something went wrong.
Binary file modified
BIN
-53 Bytes
(100%)
...layout/appointments/etalons/filtering-visible=true-maxAppointmentsPerCell=0.png
Oops, something went wrong.
Binary file modified
BIN
-53 Bytes
(100%)
...t/appointments/etalons/filtering-visible=undefined-maxAppointmentsPerCell=0.png
Oops, something went wrong.
Binary file modified
BIN
-1.31 KB
(99%)
...r/layout/resources/base/etalons/generic-resource(view=month-resource=false).png
Oops, something went wrong.
Binary file modified
BIN
-1007 Bytes
(99%)
...er/layout/resources/base/etalons/generic-resource(view=month-resource=true).png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,23 @@ | ||
import { NgModule } from '@angular/core'; | ||
import { NgModule, Injector, createNgModuleRef } from '@angular/core'; | ||
import { HttpClient, HttpClientModule } from '@angular/common/http'; | ||
import devextremeAjax from 'devextreme/core/utils/ajax'; | ||
// eslint-disable-next-line import/named | ||
import { sendRequestFactory } from './ajax'; | ||
|
||
@NgModule({ | ||
exports: [], | ||
imports: [HttpClientModule], | ||
imports: [], | ||
providers: [], | ||
}) | ||
export class DxHttpModule { | ||
constructor(httpClient: HttpClient) { | ||
constructor(injector: Injector) { | ||
let httpClient: HttpClient = injector.get(HttpClient, null); | ||
|
||
if (!httpClient) { | ||
const moduleRef = createNgModuleRef(HttpClientModule, injector); | ||
|
||
httpClient = moduleRef.injector.get(HttpClient); | ||
} | ||
|
||
devextremeAjax.inject({ sendRequest: sendRequestFactory(httpClient) }); | ||
} | ||
} |
Oops, something went wrong.