Skip to content

Commit c85a6f4

Browse files
Merge pull request #176 from Syncfusion-Content/hotfix/hotfix-v24.1.41
DOCINFRA-2341_merged_using_automation
2 parents 989d75c + 65aa663 commit c85a6f4

File tree

80 files changed

+2063
-731
lines changed

Some content is hidden

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

80 files changed

+2063
-731
lines changed

ej2-javascript-toc.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@
774774
<li><a href="/ej2-javascript/document-editor/fields">Fields</a></li>
775775
<li><a href="/ej2-javascript/document-editor/form-fields">Form fields</a></li>
776776
<li><a href="/ej2-javascript/document-editor/clipboard">Clipboard</a></li>
777+
<li><a href="/ej2-javascript/document-editor/collaborative-editing">Collaborative Editing</a></li>
777778
<li><a href="/ej2-javascript/document-editor/history">Undo and redo</a></li>
778779
<li><a href="/ej2-javascript/document-editor/find-and-replace">Find and Replace</a></li>
779780
<li><a href="/ej2-javascript/document-editor/keyboard-shortcut">Keyboard shortcuts</a></li>
@@ -823,7 +824,8 @@
823824
</li>
824825
<li><a href="https://ej2.syncfusion.com/javascript/documentation/api/document-editor/">API Reference</a></li>
825826
</ul>
826-
</li><li>
827+
</li>
828+
<li>
827829
DropDown Menu
828830
<ul>
829831
<li><a href="/ej2-javascript/drop-down-button/es5-getting-started">Getting Started</a></li>
@@ -1386,6 +1388,7 @@
13861388
<li><a href="/ej2-javascript/listview/nested-list">Nested list</a></li>
13871389
<li><a href="/ej2-javascript/listview/customizing-templates">Customizing templates</a></li>
13881390
<li><a href="/ej2-javascript/listview/virtualization">Virtualization</a></li>
1391+
<li><a href="/ej2-javascript/listview/scrolling">Scrolling</a></li>
13891392
<li><a href="/ej2-javascript/listview/accessibility">Accessibility</a></li>
13901393
<li><a href="/ej2-javascript/listview/style">CSS Structure</a></li>
13911394
<li><a href="/ej2-javascript/listview/ej1-api-migration">EJ1 migration</a></li>

ej2-javascript/accumulation-chart/tool-tip.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Any HTML element can be displayed in the tooltip by using the [`template`](../..
137137

138138
## Fixed tooltip
139139

140-
By default, tooltip track the mouse movement, but you can set a fixed position for the tooltip by using the `location` property.
140+
By default, tooltip track the mouse movement, but you can set a fixed position for the tooltip by using the [`location`](../../api/accumulation-chart/tooltipSettingsModel/#location) property.
141141

142142
{% if page.publishingplatform == "typescript" %}
143143

ej2-javascript/chart/Chart-types/range-step-area.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following properties can be used to customize the `area` series.
4949
* [fill](../../api/chart/seriesModel/#fill) – Specifies the color of the area series.
5050
* [opacity](../../api/chart/seriesModel/#opacity) – Specifies the opacity of [fill](../../api/chart/seriesModel/#fill).
5151
* [dashArray](../../api/chart/seriesModel/#dasharray) – Specifies the dashes of series.
52-
* `step` – Specifies the position of the step for the series.
52+
* [step](../../api/chart/seriesModel/#step) – Specifies the position of the step for the series.
5353

5454
{% if page.publishingplatform == "typescript" %}
5555

ej2-javascript/chart/Chart-types/stacked-step-area.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following properties can be used to customize the `stacked step area` series
4848
* [fill](../../api/chart/seriesModel/#fill) – Specifies the color of the area series.
4949
* [opacity](../../api/chart/seriesModel/#opacity) – Specifies the opacity of [fill](../../api/chart/seriesModel/#fill).
5050
* [dashArray](../../api/chart/seriesModel/#dasharray) – Specifies the dashes of series.
51-
* `step` – Specifies the position of the step for the series.
51+
* [step](../../api/chart/seriesModel/#step) – Specifies the position of the step for the series.
5252

5353
{% if page.publishingplatform == "typescript" %}
5454

ej2-javascript/chart/Chart-types/step-area.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following properties can be used to customize the `step area` series.
4848
* [fill](../../api/chart/seriesModel/#fill) – Specifies the color of the area series.
4949
* [opacity](../../api/chart/seriesModel/#opacity) – Specifies the opacity of [fill](../../api/chart/seriesModel/#fill).
5050
* [dashArray](../../api/chart/seriesModel/#dasharray) – Specifies the dashes of series.
51-
* `step` – Specifies the position of the step for the series.
51+
* [step](../../api/chart/seriesModel/#step) – Specifies the position of the step for the series.
5252

5353
{% if page.publishingplatform == "typescript" %}
5454

ej2-javascript/chart/Chart-types/step-line.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following properties can be used to customize the `step line` series.
4949
* [opacity](../../api/chart/seriesModel/#opacity) – Specifies the opacity of [fill](../../api/chart/seriesModel/#fill-string).
5050
* [dashArray](../../api/chart/seriesModel/#dasharray) – Specifies the dashes for series.
5151
* [width](../../api/chart/seriesModel/#width) – Specifies the width for series.
52-
* `step` – Specifies the position of the step for the series.
52+
* [step](../../api/chart/seriesModel/#step) – Specifies the position of the step for the series.
5353

5454
{% if page.publishingplatform == "typescript" %}
5555

ej2-javascript/chart/tool-tip.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ By default, tooltip is not visible. You can enable the tooltip by setting [`enab
5050

5151
## Fixed tooltip
5252

53-
By default, tooltip track the mouse movement, but you can set a fixed position for the tooltip by using the `location` property.
53+
By default, tooltip track the mouse movement, but you can set a fixed position for the tooltip by using the [`location`](../../api/chart/tooltipSettings/#location) property.
5454

5555
{% if page.publishingplatform == "typescript" %}
5656

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

2+
3+
4+
25
var nodes = [
36
{ id: 'Start', offsetY: 50, annotations: [{ content: 'Start' }], shape: { type: 'Flow', shape: 'Terminator' } },
47
{ id: 'Init', offsetY: 140, annotations: [{ content: 'var i = 0;' }], shape: { type: 'Flow', shape: 'Process' } },
@@ -15,34 +18,16 @@ var connector = [
1518
{
1619
id: 'connector4', sourceID: 'Condition', targetID: 'End', annotations: [{ content: 'No' }],
1720
type: 'Orthogonal',
18-
segments: [
19-
{ type: 'Orthogonal', length: 50, direction: "Right" },
20-
{ type: 'Orthogonal', length: 300, direction: "Bottom" }
21-
]
21+
segments: [{ length: 50, direction: 'Bottom' }]
2222
},
2323
{ id: 'connector5', sourceID: 'Print', targetID: 'Increment' },
2424
{
2525
id: 'connector6', sourceID: 'Increment', targetID: 'Condition',
2626
type: 'Orthogonal',
27-
segments: [
28-
{ type: 'Orthogonal', length: 50, direction: "Left" },
29-
{ type: 'Orthogonal', length: 200, direction: "Top" }
30-
]
27+
segments: [{ length: 50, direction: 'Bottom' }]
3128
}
3229
];
3330

3431
var diagram = new ej.diagrams.Diagram({
35-
width: '100%', height: '600px', nodes: nodes, connectors: connector,
36-
getNodeDefaults: function (node) {
37-
node.height = 50;
38-
node.width = 140;
39-
node.offsetX = 300;
40-
return node;
41-
},
42-
getConnectorDefaults: function (obj) {
43-
obj.type = "Orthogonal";
44-
obj.targetDecorator = { shape: 'Arrow', width: 10, height: 10 };
45-
return obj;
46-
},
47-
created: function () { diagram.fitToPage(); }
32+
width: '100%', height: '600px', nodes: nodes, connectors: connector
4833
}, '#element');

ej2-javascript/code-snippet/diagram/getting-started-cs9/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let connector: ConnectorModel[] = [
2222
id: 'connector4', sourceID: 'Condition', targetID: 'End', annotations: [{ content: 'No' }],
2323
type: 'Orthogonal',
2424
segments: [
25-
{ type: 'Orthogonal', length: 50, direction: "Right" },
25+
{ type: 'Orthogonal', length: 30, direction: "Right" },
2626
{ type: 'Orthogonal', length: 300, direction: "Bottom" }
2727
]
2828
},
@@ -31,7 +31,7 @@ let connector: ConnectorModel[] = [
3131
id: 'connector6', sourceID: 'Increment', targetID: 'Condition',
3232
type: 'Orthogonal',
3333
segments: [
34-
{ type: 'Orthogonal', length: 50, direction: "Left" },
34+
{ type: 'Orthogonal', length: 30, direction: "Left" },
3535
{ type: 'Orthogonal', length: 200, direction: "Top" }
3636
]
3737
}];

ej2-javascript/code-snippet/diagram/umldiagramshapes-cs12/systemjs.config.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@ System.config({
1515
map: {
1616
main: "index.ts",
1717
typescript: "https://unpkg.com/typescript@2.2.2/lib/typescript.js",
18-
<<<<<<<< HEAD:ej2-javascript/code-snippet/chart/user-interaction-cs45/systemjs.config.js
19-
"@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js",
20-
"@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js",
21-
"@syncfusion/ej2-charts": "syncfusion:ej2-charts/dist/ej2-charts.umd.min.js",
22-
========
2318
"@syncfusion/ej2-base": "syncfusion:ej2-base/dist/ej2-base.umd.min.js",
2419
"@syncfusion/ej2-data": "syncfusion:ej2-data/dist/ej2-data.umd.min.js",
2520
"@syncfusion/ej2-diagrams": "syncfusion:ej2-diagrams/dist/ej2-diagrams.umd.min.js",
26-
>>>>>>>> remotes/origin/development:ej2-javascript/code-snippet/diagram/umldiagramshapes-cs12/systemjs.config.js
2721
"@syncfusion/ej2-popups": "syncfusion:ej2-popups/dist/ej2-popups.umd.min.js",
2822
"@syncfusion/ej2-buttons": "syncfusion:ej2-buttons/dist/ej2-buttons.umd.min.js",
2923
"@syncfusion/ej2-pdf-export": "syncfusion:ej2-pdf-export/dist/ej2-pdf-export.umd.min.js",
@@ -34,12 +28,7 @@ System.config({
3428
"@syncfusion/ej2-lists": "syncfusion:ej2-lists/dist/ej2-lists.umd.min.js",
3529
"@syncfusion/ej2-inputs": "syncfusion:ej2-inputs/dist/ej2-inputs.umd.min.js",
3630
"@syncfusion/ej2-svg-base": "syncfusion:ej2-svg-base/dist/ej2-svg-base.umd.min.js",
37-
<<<<<<<< HEAD:ej2-javascript/code-snippet/chart/user-interaction-cs45/systemjs.config.js
38-
"@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js",
39-
"@syncfusion/ej2-excel-export": "syncfusion:ej2-excel-export/dist/ej2-excel-export.umd.min.js"
40-
========
4131
"@syncfusion/ej2-splitbuttons": "syncfusion:ej2-splitbuttons/dist/ej2-splitbuttons.umd.min.js"
42-
>>>>>>>> remotes/origin/development:ej2-javascript/code-snippet/diagram/umldiagramshapes-cs12/systemjs.config.js
4332
}
4433
});
4534

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Inject collaborative editing module.
2+
ej.documenteditor.DocumentEditor.Inject(ej.documenteditor.CollaborativeEditingHandler);
3+
ej.documenteditor.DocumentEditorContainer.Inject(ej.documenteditor.Toolbar);
4+
let container = new ej.documenteditor.DocumentEditorContainer({ enableToolbar: true, height: '590px',});
5+
6+
container.serviceUrl = 'http://localhost:5000/api/documenteditor/';
7+
container.appendTo('#container');
8+
9+
// Enable collaborative editing in Document Editor.
10+
container.documentEditor.enableCollaborativeEditing = true;
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { DocumentEditorContainer, DocumentEditor, CollaborativeEditingHandler} from '@syncfusion/ej2-documenteditor';
2+
3+
//Inject collaborative editing module.
4+
DocumentEditor.Inject(CollaborativeEditingHandler);
5+
DocumentEditorContainer.Inject(Toolbar);
6+
let container: DocumentEditorContainer = new DocumentEditorContainer({ enableToolbar: true, height: '590px',});
7+
8+
container.serviceUrl = 'http://localhost:5000/api/documenteditor/';
9+
container.appendTo('#container');
10+
11+
//Enable collaborative editing in Document Editor.
12+
container.documentEditor.enableCollaborativeEditing = true;
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
let connectionId = "";
2+
3+
var connection = new signalR.HubConnectionBuilder().withUrl(serviceUrl + '/documenteditorhub', {
4+
skipNegotiation: true,
5+
transport: signalR.HttpTransportType.WebSockets
6+
}).withAutomaticReconnect().build();
7+
8+
connection.onclose(async () => {
9+
if (connection.state === signalR.HubConnectionState.Disconnected) {
10+
alert('Connection lost. Please relod the browser to continue.');
11+
}
12+
});
13+
14+
async function start(data) {
15+
try {
16+
connection.start().then(function () {
17+
// Join the collaborative editing session with the specified room name.
18+
connection.send('JoinGroup', { roomName: data.roomName, currentUser: data.currentUser });
19+
console.log('server connected!!!');
20+
});
21+
} catch (err) {
22+
console.log(err);
23+
setTimeout(start, 5000);
24+
}
25+
};
26+
// Event handler to handle data received
27+
connection.on('dataReceived', onDataRecived.bind(this));
28+
29+
function onDataRecived(action, data) {
30+
if (connections) {
31+
if (action == 'connectionId') {
32+
connectionId = data;
33+
} else if (connectionId != data.connectionId) {
34+
if (action == 'action' || action == 'addUser') {
35+
// Add user info when new user join the collaborative editing session.
36+
titleBar.addUser(data);
37+
} else if (action == 'removeUser') {
38+
// Remove user info from title bar once user is disconnected.
39+
titleBar.removeUser(data);
40+
}
41+
}
42+
// Apply remote changes to current document.
43+
connections.applyRemoteAction(action, data);
44+
}
45+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import {HubConnectionBuilder, HttpTransportType, HubConnectionState } from '@microsoft/signalr';
2+
3+
let connectionId: string= "";
4+
5+
var connection = new HubConnectionBuilder().withUrl(serviceUrl + '/documenteditorhub', {
6+
skipNegotiation: true,
7+
transport: HttpTransportType.WebSockets
8+
}).withAutomaticReconnect().build();
9+
10+
connection.onclose(async () => {
11+
if (connection.state === HubConnectionState.Disconnected) {
12+
alert('Connection lost. Please relod the browser to continue.');
13+
}
14+
});
15+
16+
async function start(data: any) {
17+
try {
18+
connection.start().then(function () {
19+
//Join the collaborative editing session with the specified room name.
20+
connection.send('JoinGroup', { roomName: data.roomName, currentUser: data.currentUser });
21+
console.log('server connected!!!');
22+
});
23+
} catch (err) {
24+
console.log(err);
25+
setTimeout(start, 5000);
26+
}
27+
};
28+
//Event handler to handle data received
29+
connection.on('dataReceived', onDataRecived.bind(this));
30+
31+
function onDataRecived(action: string, data: any) {
32+
if (connections) {
33+
if (action == 'connectionId') {
34+
connectionId = data;
35+
} else if (connectionId != data.connectionId) {
36+
if (action == 'action' || action == 'addUser') {
37+
//Add user info when new user join the collaborative editing session.
38+
titleBar.addUser(data);
39+
} else if (action == 'removeUser') {
40+
//Remove user info from title bar once user is disconnected.
41+
titleBar.removeUser(data);
42+
}
43+
}
44+
//Apply remote changes to current document.
45+
connections.applyRemoteAction(action, data);
46+
}
47+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function openDocument(responseText, roomName) {
2+
let data = JSON.parse(responseText);
3+
// Get collaborative editing module.
4+
connections = container.documentEditor.collaborativeEditingHandlerModule;
5+
// Configure collaborative editing room name in collaborative editing module
6+
connections.updateRoomInfo(roomName, data.version, serviceUrl);
7+
container.documentEditor.open(data.sfdt);
8+
setTimeout(function () {
9+
// connect to signalR room with specified name.
10+
start({ action: 'connect', roomName: roomName, currentUser: container.currentUser }, null);
11+
});
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function openDocument(responseText: string, roomName: string): void {
2+
let data = JSON.parse(responseText);
3+
//Get collaborative editing module.
4+
connections = container.documentEditor.collaborativeEditingHandlerModule;
5+
//Configure collaborative editing room name in collaborative editing module
6+
connections.updateRoomInfo(roomName, data.version, serviceUrl);
7+
container.documentEditor.open(data.sfdt);
8+
setTimeout(function () {
9+
// connect to signalR room with specified name.
10+
start({ action: 'connect', roomName: roomName, currentUser: container.currentUser }, null);
11+
});
12+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
container.contentChange = function (args) {
2+
if (connections) {
3+
// Send current changes to server to broadcast it to other users.
4+
connections.sendActionToServer(args.operations)
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
container.contentChange = function (args: ContainerContentChangeEventArgs) {
2+
if (connections) {
3+
//Send current changes to server to broadcast it to other users.
4+
connections.sendActionToServer(args.operations)
5+
}
6+
}

ej2-javascript/code-snippet/dropdownlist/virtual-scroll/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ let DropDownListObject: DropDownList = new DropDownList({
2323
//set the placeholder to DropDownList input
2424
placeholder:"Select an Item ",
2525
//set enableVirtualization property to true
26-
enableVirtualization: false,
26+
enableVirtualization: true,
2727
//set allowFiltering property to true
28-
allowFiltering: true,
28+
allowFiltering: false,
2929
//set the height of the popup element
3030
popupHeight: '200px'
3131
});
Loading
Loading
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
ej.base.enableRipple(true);
2+
3+
var imageEditorObj = new ej.imageeditor.ImageEditor({
4+
width: '550px',
5+
height: '330px',
6+
toolbar: [],
7+
fontFamily: { default: 'Arial', items: [{id: 'arial', text: 'Arial'}, {id: 'brush script mt', text: 'Brush Script MT'},
8+
{id: 'papyrus', text: 'Papyrus'}, {id: 'times new roman', text: 'Times New Roman'}, {id: 'courier new', text: 'Courier New'}] },
9+
created: function () {
10+
imageEditorObj.open('bee-eater.png');
11+
},
12+
fileOpened: function () {
13+
let dimension = imageEditorObj.getImageDimension();
14+
imageEditorObj.drawText(dimension.x,dimension.y, null, 'Arial');
15+
},
16+
});
17+
imageEditorObj.appendTo('#imageeditor');
18+
19+
document.getElementById('brushScriptMT').onclick = function() {
20+
imageEditorObj.reset();
21+
let dimension = imageEditorObj.getImageDimension();
22+
imageEditorObj.drawText(dimension.x,dimension.y, null, 'Brush Script MT');
23+
}
24+
25+
document.getElementById('papyrus').onclick = function() {
26+
imageEditorObj.reset();
27+
let dimension = imageEditorObj.getImageDimension();
28+
imageEditorObj.drawText(dimension.x,dimension.y, null, 'Papyrus');
29+
}
30+
31+
document.getElementById('timesNewRoman').onclick = function() {
32+
imageEditorObj.reset();
33+
let dimension = imageEditorObj.getImageDimension();
34+
imageEditorObj.drawText(dimension.x,dimension.y, null, 'Times New Roman');
35+
}
36+
37+
document.getElementById('courierNew').onclick = function() {
38+
imageEditorObj.reset();
39+
let dimension = imageEditorObj.getImageDimension();
40+
imageEditorObj.drawText(dimension.x,dimension.y, null, 'Courier New');
41+
}

0 commit comments

Comments
 (0)