Skip to content

Commit 94b1ec6

Browse files
committed
#54 - Fix checkbox select.
1 parent c556bb9 commit 94b1ec6

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

assets/reportviewer.net.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
return dtoArr;
6666
}
6767

68-
self.selectCheckbox = function (element) {
68+
self.selectCheckbox = function (element, selectAll) {
6969
var id = $(element).attr('id');
7070
var list = id.indexOf('-') > -1;
7171

@@ -81,7 +81,12 @@
8181
}
8282
}
8383

84-
$(element).prop('checked', !checked);
84+
if (selectAll) {
85+
$(element).prop('checked', true);
86+
}
87+
else {
88+
$(element).prop('checked', checked);
89+
}
8590
}
8691

8792
self.postReportParameters = function () {
@@ -140,7 +145,7 @@
140145
let checkboxes = $(dropdownContainer).find('input[type="checkbox"]');
141146

142147
$.each(checkboxes, function (idx, ele) {
143-
self.selectCheckbox($(ele));
148+
self.selectCheckbox($(ele), true);
144149
});
145150
});
146151

@@ -151,7 +156,7 @@
151156
});
152157

153158
$('.report-viewer input[type="checkbox"]').on("change", function (event) {
154-
self.selectCheckbox($(this));
159+
self.selectCheckbox($(this), false);
155160
});
156161

157162
$('.report-viewer #RunReportBtn').on('click', function () {

src/ReportViewer.NET.Web/wwwroot/js/site.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
return dtoArr;
6666
}
6767

68-
self.selectCheckbox = function (element) {
68+
self.selectCheckbox = function (element, selectAll) {
6969
var id = $(element).attr('id');
7070
var list = id.indexOf('-') > -1;
7171

@@ -81,7 +81,12 @@
8181
}
8282
}
8383

84-
$(element).prop('checked', !checked);
84+
if (selectAll) {
85+
$(element).prop('checked', true);
86+
}
87+
else {
88+
$(element).prop('checked', checked);
89+
}
8590
}
8691

8792
self.postReportParameters = function () {
@@ -140,7 +145,7 @@
140145
let checkboxes = $(dropdownContainer).find('input[type="checkbox"]');
141146

142147
$.each(checkboxes, function (idx, ele) {
143-
self.selectCheckbox($(ele));
148+
self.selectCheckbox($(ele), true);
144149
});
145150
});
146151

@@ -151,7 +156,7 @@
151156
});
152157

153158
$('.report-viewer input[type="checkbox"]').on("change", function (event) {
154-
self.selectCheckbox($(this));
159+
self.selectCheckbox($(this), false);
155160
});
156161

157162
$('.report-viewer #RunReportBtn').on('click', function () {

0 commit comments

Comments
 (0)