Skip to content

Commit a3baf37

Browse files
MydeensnMydeensn
authored
Merge pull request #674 from syncfusion-content/948920-conflict
948920: Need to resolve merge conflict file
2 parents a887f8b + 7f7d5ac commit a3baf37

File tree

425 files changed

+7453
-1885
lines changed

Some content is hidden

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

425 files changed

+7453
-1885
lines changed

‎ej2-react-toc.html

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -722,8 +722,10 @@
722722
<li><a href="/ej2-react/data/getting-started">Getting Started</a></li>
723723
<li><a href="/ej2-react/data/data-binding">Data Binding</a></li>
724724
<li><a href="/ej2-react/data/adaptors">Adaptors</a></li>
725+
<li><a href="/ej2-react/data/cache">Cache</a></li>
725726
<li><a href="/ej2-react/data/querying">Querying</a></li>
726727
<li><a href="/ej2-react/data/manipulation">CRUD Data operations</a></li>
728+
<li><a href="/ej2-react/data/applying-middleware-logic">Applying Middleware Logic</a></li>
727729
<li><a href="/ej2-react/data/how-to">How To</a></li>
728730
</ul>
729731
</li><li>
@@ -1554,28 +1556,28 @@
15541556
<li><a href="/ej2-react/image-editor/end-user-capabilities">End User Capabilities</a></li>
15551557
<li><a href="/ej2-react/image-editor/open-save">Open and Save</a></li>
15561558
<li><a href="/ej2-react/image-editor/selection-cropping">Selection and Cropping</a></li>
1557-
<li><a href="/ej2-react/image-editor/annotation">Annotation</a></li>
15581559
<li><a href="/ej2-react/image-editor/transform">Transform</a></li>
1559-
<li><a href="/ej2-react/image-editor/toolbar">Toolbar</a></li>
1560+
<li><a href="/ej2-react/image-editor/annotation">Annotation</a></li>
1561+
<li><a href="/ej2-react/image-editor/z-order">Z-Order</a></li>
15601562
<li><a href="/ej2-react/image-editor/quick-access">Quick Access Toolbar</a></li>
1561-
<li><a href="/ej2-react/image-editor/undo-redo">Undo and Redo</a></li>
1562-
<li><a href="/ej2-react/image-editor/filter">Filter</a></li>
15631563
<li><a href="/ej2-react/image-editor/finetune">Finetune</a></li>
1564-
<li><a href="/ej2-react/image-editor/resize">Resize</a></li>
1564+
<li><a href="/ej2-react/image-editor/filter">Filter</a></li>
15651565
<li><a href="/ej2-react/image-editor/frame">Frame</a></li>
1566-
<li><a href="/ej2-react/image-editor/z-order">Z-Order</a></li>
1566+
<li><a href="/ej2-react/image-editor/resize">Resize</a></li>
15671567
<li><a href="/ej2-react/image-editor/redact">Redact</a></li>
1568+
<li><a href="/ej2-react/image-editor/undo-redo">Undo Redo</a></li>
15681569
<li><a href="/ej2-react/image-editor/image-restrictions">Image Restrictions</a></li>
1570+
<li><a href="/ej2-react/image-editor/toolbar">Toolbar</a></li>
15691571
<li><a href="/ej2-react/image-editor/localization">Localization</a></li>
1572+
<li><a href="/ej2-react/image-editor/accessibility">Accessibility</a></li>
15701573
<li>How To
15711574
<ul>
1575+
<li><a href="/ej2-react/image-editor/how-to/reset">Reset an image</a></li>
15721576
<li><a href="/ej2-react/image-editor/how-to/clear-image">Clear an Image</a></li>
15731577
<li><a href="/ej2-react/image-editor/how-to/render-dialog">Render Dialog in Image Editor</a></li>
1574-
<li><a href="/ej2-react/image-editor/how-to/reset">Reset an image</a></li>
15751578
</ul>
15761579
</li>
15771580
<li><a href="https://ej2.syncfusion.com/react/documentation/api/image-editor/">API Reference</a></li>
1578-
<li><a href="/ej2-react/image-editor/accessibility">Accessibility</a></li>
15791581
</ul>
15801582
</li><li>
15811583
InplaceEditor
@@ -2556,6 +2558,19 @@
25562558
<li><a href="/ej2-react/sparkline/ej1-api-migration">Migration from Essential JS 1</a></li>
25572559
<li><a href="https://ej2.syncfusion.com/react/documentation/api/sparkline/">API Reference</a></li>
25582560
</ul>
2561+
</li><li>
2562+
Speech To Text
2563+
<ul>
2564+
<li><a href="/ej2-react/speech-to-text/getting-started">Getting Started</a></li>
2565+
<li><a href="/ej2-react/speech-to-text/speech-recognition">Speech recognition</a></li>
2566+
<li><a href="/ej2-react/speech-to-text/appearance">Appearance</a></li>
2567+
<li><a href="/ej2-react/speech-to-text/globalization">Globalization</a></li>
2568+
<li><a href="/ej2-react/speech-to-text/accessibility">Accessibility</a></li>
2569+
<li><a href="/ej2-react/speech-to-text/security">Security concerns</a></li>
2570+
<li><a href="/ej2-react/speech-to-text/methods">Methods</a></li>
2571+
<li><a href="/ej2-react/speech-to-text/events">Events</a></li>
2572+
<li><a href="https://ej2.syncfusion.com/react/documentation/api/speech-to-text/">API Reference</a></li>
2573+
</ul>
25592574
</li><li>
25602575
SpeedDial
25612576
<ul>

‎ej2-react/bullet-chart/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ These modules should be injected to the `services` section as follows,
120120
{% tabs %}
121121
{% highlight js tabtitle="index.jsx" %}
122122

123-
import { BulletChartComponent, BulletTooltip } from "@syncfusion/ej2-react-charts";
123+
import { BulletChartComponent, BulletTooltip, Inject } from "@syncfusion/ej2-react-charts";
124124
import * as React from "react";
125125
import * as ReactDOM from "react-dom";
126126

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs2/app/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export let data = [
1414
];
1515

1616
function App() {
17-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
17+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
1818
valueType: 'Category',
1919
labelRotation: -45,
2020
labelPlacement: 'BetweenTicks'
@@ -28,7 +28,7 @@ function App() {
2828
<Chart3DSeriesDirective dataSource={data} xName='x' yName='y' type='Column'>
2929
</Chart3DSeriesDirective>
3030
</Chart3DSeriesCollectionDirective>
31-
</Chart3DComponent>;
31+
</Chart3DComponent>)
3232
}
3333
;
3434
export default App;

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs2/app/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export let data: any[] = [
1717

1818

1919
function App() {
20-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
20+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
2121
valueType: 'Category',
2222
labelRotation: -45,
2323
labelPlacement: 'BetweenTicks'
@@ -31,7 +31,7 @@ function App() {
3131
<Chart3DSeriesDirective dataSource={data} xName='x' yName='y' type='Column'>
3232
</Chart3DSeriesDirective>
3333
</Chart3DSeriesCollectionDirective>
34-
</Chart3DComponent>
34+
</Chart3DComponent>)
3535
};
3636
export default App;
3737
ReactDOM.render(<App />, document.getElementById("charts"));

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs3/app/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export let data = [
1414
];
1515

1616
function App() {
17-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
17+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
1818
valueType: 'Category',
1919
labelRotation: -45,
2020
labelPlacement: 'BetweenTicks'
@@ -28,7 +28,7 @@ function App() {
2828
<Chart3DSeriesDirective dataSource={data} xName='x' yName='y' type='Column'>
2929
</Chart3DSeriesDirective>
3030
</Chart3DSeriesCollectionDirective>
31-
</Chart3DComponent>;
31+
</Chart3DComponent>);
3232
}
3333
;
3434
export default App;

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs3/app/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export let data: any[] = [
1717

1818

1919
function App() {
20-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
20+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
2121
valueType: 'Category',
2222
labelRotation: -45,
2323
labelPlacement: 'BetweenTicks'
@@ -31,7 +31,7 @@ function App() {
3131
<Chart3DSeriesDirective dataSource={data} xName='x' yName='y' type='Column'>
3232
</Chart3DSeriesDirective>
3333
</Chart3DSeriesCollectionDirective>
34-
</Chart3DComponent>
34+
</Chart3DComponent>)
3535
};
3636
export default App;
3737
ReactDOM.render(<App />, document.getElementById("charts"));

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs4/app/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export let data = [
1414
];
1515

1616
function App() {
17-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
17+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
1818
valueType: 'Category',
1919
labelRotation: -45,
2020
labelPlacement: 'BetweenTicks'
@@ -28,7 +28,7 @@ function App() {
2828
<Chart3DSeriesDirective dataSource={data} xName='x' name='Sales' yName='y' type='Column'>
2929
</Chart3DSeriesDirective>
3030
</Chart3DSeriesCollectionDirective>
31-
</Chart3DComponent>;
31+
</Chart3DComponent>);
3232
}
3333
;
3434
export default App;

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs4/app/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export let data: any[] = [
1717

1818

1919
function App() {
20-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
20+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
2121
valueType: 'Category',
2222
labelRotation: -45,
2323
labelPlacement: 'BetweenTicks'
@@ -31,7 +31,7 @@ function App() {
3131
<Chart3DSeriesDirective dataSource={data} xName='x' name='Sales' yName='y' type='Column'>
3232
</Chart3DSeriesDirective>
3333
</Chart3DSeriesCollectionDirective>
34-
</Chart3DComponent>
34+
</Chart3DComponent>)
3535
};
3636
export default App;
3737
ReactDOM.render(<App />, document.getElementById("charts"));

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs5/app/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export let data = [
1414
];
1515

1616
function App() {
17-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
17+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
1818
valueType: 'Category',
1919
labelRotation: -45,
2020
labelPlacement: 'BetweenTicks'
@@ -28,7 +28,7 @@ function App() {
2828
<Chart3DSeriesDirective dataSource={data} dataLabel={{ visible: true}} xName='x' name='Sales' yName='y' type='Column'>
2929
</Chart3DSeriesDirective>
3030
</Chart3DSeriesCollectionDirective>
31-
</Chart3DComponent>;
31+
</Chart3DComponent>);
3232
}
3333
;
3434
export default App;

‎ej2-react/code-snippet/3d-chart/getting-started/getting-started-cs5/app/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export let data: any[] = [
1717

1818

1919
function App() {
20-
return <Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
20+
return (<Chart3DComponent id='charts' style={{ textAlign: "center" }} primaryXAxis={{
2121
valueType: 'Category',
2222
labelRotation: -45,
2323
labelPlacement: 'BetweenTicks'
@@ -31,7 +31,7 @@ function App() {
3131
<Chart3DSeriesDirective dataLabel={{ visible: true }} dataSource={data} xName='x' name='Sales' yName='y' type='Column'>
3232
</Chart3DSeriesDirective>
3333
</Chart3DSeriesCollectionDirective>
34-
</Chart3DComponent>
34+
</Chart3DComponent>)
3535
};
3636
export default App;
3737
ReactDOM.render(<App />, document.getElementById("charts"));

0 commit comments

Comments
 (0)