Skip to content

Commit e78e975

Browse files
committed
Merge branch '25_2' of github.com:DevExpress/DevExtreme into dg_25_2_ai_column_jquery_demo
2 parents 30b0c64 + 8d9ffd4 commit e78e975

File tree

364 files changed

+1971
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+1971
-55
lines changed

apps/demos/Demos/SpeechToText/Overview/Angular/app/app.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ export class AppComponent {
117117
onResult({ event }) {
118118
const { results } = event;
119119
const resultText = Object.values(results)
120-
.map((resultItem) => resultItem[0].transcript)
120+
.map((resultItem) => resultItem[0].transcript.trim())
121121
.join(' ');
122122
this.textAreaValue = resultText;
123123
}

apps/demos/Demos/SpeechToText/Overview/React/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default function App() {
7575
const onResult = useCallback(({ event }) => {
7676
const { results } = event;
7777
const resultText = Object.values(results)
78-
.map((resultItem: any) => resultItem[0].transcript)
78+
.map((resultItem: any) => resultItem[0].transcript.trim())
7979
.join(' ');
8080
setTextAreaValue(resultText);
8181
}, []);

apps/demos/Demos/SpeechToText/Overview/ReactJs/App.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default function App() {
6262
const onResult = useCallback(({ event }) => {
6363
const { results } = event;
6464
const resultText = Object.values(results)
65-
.map((resultItem) => resultItem[0].transcript)
65+
.map((resultItem) => resultItem[0].transcript.trim())
6666
.join(' ');
6767
setTextAreaValue(resultText);
6868
}, []);

apps/demos/Demos/SpeechToText/Overview/Vue/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ function onStopClick() {
162162
function onResult({ event }: Record<string, any>) {
163163
const { results } = event;
164164
const resultText = Object.values(results)
165-
.map((resultItem: any) => resultItem[0].transcript)
165+
.map((resultItem: any) => resultItem[0].transcript.trim())
166166
.join(' ');
167167
textAreaValue.value = resultText;
168168

apps/demos/Demos/SpeechToText/Overview/jQuery/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $(() => {
4343
onResult: ({ event }) => {
4444
const { results } = event;
4545
const resultText = Object.values(results)
46-
.map((resultItem) => resultItem[0].transcript)
46+
.map((resultItem) => resultItem[0].transcript.trim())
4747
.join(' ');
4848

4949
textArea.option('value', resultText);

apps/demos/testing/known-warnings.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ export const knownWarnings = [
22
'W0019 -',
33
'W0022 -',
44
'W2108 -',
5+
'W3001 -',
56
];

e2e/testcafe-devextreme/tests/scheduler/common/a11y/contrast.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ import { testScreenshot } from '../../../../helpers/themeUtils';
77
fixture.disablePageReloads`a11y - contrast`
88
.page(url(__dirname, '../../../container.html'));
99

10+
// visual: generic.light
11+
// visual: generic.dark
12+
// visual: fluent.light
13+
// visual: fluent.dark
1014
test('Scheduler a11y: Insufficient contrast of day numbers in the MonthView', async (t) => {
1115
const scheduler = new Scheduler('#container');
1216
const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

e2e/testcafe-devextreme/tests/scheduler/common/appointmentForm/form.visual.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ const getResources = (withIcons = false) => ([
5959
},
6060
]);
6161

62+
// visual: generic.light
63+
// visual: fluent.blue.light
64+
// visual: material.blue.light
6265
[
6366
{ isRecurringAppointment: false, isAllDay: true },
6467
{ isRecurringAppointment: false, isAllDay: false },

e2e/testcafe-devextreme/tests/scheduler/common/header/etalons/scheduler-toolbar-menu.png renamed to e2e/testcafe-devextreme/tests/scheduler/common/header/etalons/scheduler-toolbar-menu (generic.light).png

File renamed without changes.

0 commit comments

Comments
 (0)