Skip to content

Commit 13e2147

Browse files
Integrated latest changes at 05-29-2024 1:30:41 PM
1 parent 1495fb9 commit 13e2147

Some content is hidden

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

92 files changed

+1661
-92023
lines changed

ej2-javascript/code-snippet/grid/grid-cs46/ca-gregorian.json

Lines changed: 0 additions & 500 deletions
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/childdata.ts

Lines changed: 0 additions & 592 deletions
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/currencies.json

Lines changed: 0 additions & 1901 deletions
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/currencyData.json

Lines changed: 0 additions & 3509 deletions
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/datasource.ts

Lines changed: 0 additions & 9979 deletions
Large diffs are not rendered by default.

ej2-javascript/code-snippet/grid/grid-cs46/employeeData.ts

Lines changed: 0 additions & 427 deletions
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/es5-datasource.js

Lines changed: 1 addition & 10612 deletions
Large diffs are not rendered by default.

ej2-javascript/code-snippet/grid/grid-cs46/image.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

ej2-javascript/code-snippet/grid/grid-cs46/index.css

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,4 @@
1111
position: absolute;
1212
top: 45%;
1313
width: 30%;
14-
}
15-
16-
.custom.e-headercell {
17-
background-color: #f48fb1 !important;
18-
color: white;
19-
}
20-
21-
.custom.e-rowcell {
22-
background-color: #fce4ec;
23-
color: white;
24-
}
25-
26-
.e-grid .e-rowcell.customcss{
27-
background-color: #ecedee;
28-
font-family: 'Bell MT';
29-
color: red;
30-
font-size: 20px;
31-
}
32-
33-
.e-grid .e-headercell.customcss{
34-
background-color: #2382c3;
35-
color: white;
36-
font-family: 'Bell MT';
37-
font-size: 20px;
38-
}
39-
40-
.orientationcss .e-headercelldiv {
41-
transform: rotate(90deg);
42-
}
43-
14+
}

ej2-javascript/code-snippet/grid/grid-cs46/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@ var grid = new ej.grids.Grid({
66
columns: [
77
{ field: 'OrderID', headerText: 'Order ID', textAlign: 'Right', width: 100, isPrimaryKey: true, validationRules: { required: true } },
88
{ field: 'CustomerID', headerText: 'Customer ID', width: 120, validationRules: { required: true, minLength: 3 } },
9-
{ field: 'Freight', headerText: 'Freight', textAlign: 'Right', editType: 'numericedit', width: 120, format: 'C2' },
9+
{ field: 'Freight', headerText: 'Freight', validationRules: { required: true, min: 1, max: 1000 }, textAlign: 'Right', editType: 'numericedit', width: 120, format: 'C2' },
1010
{ field: 'ShipCountry', headerText: 'Ship Country', editType: 'dropdownedit', width: 150 }
1111
],
1212
height: 273
1313
});
14-
grid.appendTo('#Grid');
15-
14+
grid.appendTo('#Grid');

0 commit comments

Comments
 (0)