Skip to content

Commit 9180a14

Browse files
Revert "fix some issues"
This reverts commit bd56f32.
1 parent bd56f32 commit 9180a14

Some content is hidden

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

47 files changed

+1038
-1131
lines changed

ASP.NET Core/Views/Home/Index.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h3>DataGrid - Select multiple items and drag'n'drop</h3>
33
<div id="toggle-container">
44
<span>Clear selection after drop</span>
5-
@(Html.DevExtreme().Switch().ID("clear-after-drop-switch"))
5+
@(Html.DevExtreme().Switch().ID("clearAfterDropSwitch"))
66
</div>
77
</div>
88
@(Html.DevExtreme().TabPanel()

ASP.NET Core/package-lock.json

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ASP.NET Core/wwwroot/css/Site.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ body {
1818
padding-top: 20px;
1919
}
2020

21-
#clear-after-drop-switch {
21+
#clearAfterDropSwitch {
2222
vertical-align: text-bottom;
2323
}
2424

ASP.NET Core/wwwroot/js/GridLocal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
return column.lookup ? column.lookup.calculateCellValue(cellValue) : cellValue;
6262
},
6363
shouldClearSelection: function() {
64-
return $("#clear-after-drop-switch").dxSwitch("option", "value");
64+
return $("#clearAfterDropSwitch").dxSwitch("option", "value");
6565
}
6666
}

ASP.NET Core/wwwroot/js/GridRemote.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
return column.lookup ? column.lookup.calculateCellValue(cellValue) : cellValue;
6666
},
6767
shouldClearSelection: function () {
68-
return $("#clear-after-drop-switch").dxSwitch("option", "value");
68+
return $("#clearAfterDropSwitch").dxSwitch("option", "value");
6969
},
7070
beforeSend: function(method, ajaxOptions) {
7171
ajaxOptions.xhrFields = { withCredentials: true };

Angular/package-lock.json

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Angular/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"@angular/router": "^18.0.3",
2525
"devextreme": "24.2.3",
2626
"devextreme-angular": "24.2.3",
27-
"devextreme-aspnet-data-nojquery": "5.1.0",
2827
"rxjs": "~7.8.0",
2928
"tslib": "^2.3.0",
3029
"zone.js": "~0.14.7"

Angular/src/app/app.component.html

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,19 @@
22
<div class="demo-header">
33
<h3>DataGrid - Select multiple items and drag'n'drop</h3>
44
<div id="toggle-container">
5-
<span>Clear selection after drop</span>
6-
<dx-switch
7-
id="clear-after-drop-switch"
8-
[(value)]="clearSelectionAfterDrop"
9-
></dx-switch>
5+
<span>Clear selection after drop</span>
6+
<dx-switch id="clearAfterDropSwitch" [(value)]="clearSelectionAfterDrop"></dx-switch>
107
</div>
118
</div>
129
<dx-tab-panel [deferRendering]="false">
1310
<dxi-item title="Local Data">
1411
<div *dxTemplate>
15-
<grid-local-data
16-
[shouldClearSelection]="clearSelectionAfterDrop"
17-
></grid-local-data>
12+
<grid-local-data [shouldClearSelection]="clearSelectionAfterDrop" ></grid-local-data>
1813
</div>
1914
</dxi-item>
2015
<dxi-item title="Remote Data">
2116
<div *dxTemplate>
22-
<grid-remote-data
23-
[shouldClearSelection]="clearSelectionAfterDrop"
24-
></grid-remote-data>
17+
<grid-remote-data [shouldClearSelection]="clearSelectionAfterDrop"></grid-remote-data>
2518
</div>
2619
</dxi-item>
2720
</dx-tab-panel>

Angular/src/app/app.component.scss

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,19 @@
22
margin: 50px;
33
width: 90vw;
44
}
5-
65
.demo-header {
76
display: flex;
87
justify-content: space-between;
98
}
10-
119
.tab-item-content {
1210
margin: auto;
1311
}
14-
1512
#toggle-container {
1613
padding-top: 20px;
1714
}
18-
19-
#clear-after-drop-switch {
15+
#clearAfterDropSwitch {
2016
vertical-align: text-bottom;
2117
}
22-
2318
#toggle-container span {
2419
padding-right: 10px;
2520
}

Angular/src/app/app.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ describe('AppComponent', () => {
66
beforeEach(async () => {
77
await TestBed.configureTestingModule({
88
imports: [
9-
RouterTestingModule,
9+
RouterTestingModule
1010
],
1111
declarations: [
12-
AppComponent,
12+
AppComponent
1313
],
1414
}).compileComponents();
1515
});
@@ -20,7 +20,7 @@ describe('AppComponent', () => {
2020
expect(app).toBeTruthy();
2121
});
2222

23-
it('should have as title \'angular-test\'', () => {
23+
it(`should have as title 'angular-test'`, () => {
2424
const fixture = TestBed.createComponent(AppComponent);
2525
const app = fixture.componentInstance;
2626
expect(app.title).toEqual('angular-test');

0 commit comments

Comments
 (0)