Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit bec8ba6

Browse files
committed
Merge branch 'jyen-improve-doc' into dev
2 parents 21657a5 + cfe7362 commit bec8ba6

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

demo/advanced/rowSelect.html

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ <h1><i class="fa fa-play"></i>&nbsp;Selecting rows</h1>
3838
vm.selected = {};
3939
vm.selectAll = false;
4040
vm.toggleAll = toggleAll;
41+
vm.toggleOne = toggleOne;
4142

4243
var titleHtml = '<input type="checkbox" ng-model="showCase.selectAll" ng-click="showCase.toggleAll(showCase.selectAll, showCase.selected)">';
4344

@@ -60,7 +61,8 @@ <h1><i class="fa fa-play"></i>&nbsp;Selecting rows</h1>
6061
DTColumnBuilder.newColumn(null).withTitle(titleHtml).notSortable()
6162
.renderWith(function(data, type, full, meta) {
6263
vm.selected[full.id] = false;
63-
return '<input type="checkbox" ng-model="showCase.selected[' + data.id + ']"/>';
64+
return '<input type="checkbox" ng-model="showCase.selected[' + data.id + ']"' +
65+
'ng-click="showCase.toggleOne(showCase.selected)"/>';
6466
}),
6567
DTColumnBuilder.newColumn('id').withTitle('ID'),
6668
DTColumnBuilder.newColumn('firstName').withTitle('First name'),
@@ -80,6 +82,18 @@ <h1><i class="fa fa-play"></i>&nbsp;Selecting rows</h1>
8082
}
8183
}
8284
}
85+
function toggleOne (selectedItems) {
86+
var me = this;
87+
for (var id in selectedItems) {
88+
if (selectedItems.hasOwnProperty(id)) {
89+
if(!selectedItems[id]) {
90+
me.selectAll = false;
91+
return;
92+
}
93+
}
94+
}
95+
me.selectAll = true;
96+
}
8397
}
8498
</div>
8599
</tab>

demo/advanced/rowSelect.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function RowSelect($compile, $scope, $resource, DTOptionsBuilder, DTColumnBuilde
77
vm.selected = {};
88
vm.selectAll = false;
99
vm.toggleAll = toggleAll;
10+
vm.toggleOne = toggleOne;
1011

1112
var titleHtml = '<input type="checkbox" ng-model="showCase.selectAll"' +
1213
'ng-click="showCase.toggleAll(showCase.selectAll, showCase.selected)">';
@@ -30,7 +31,8 @@ function RowSelect($compile, $scope, $resource, DTOptionsBuilder, DTColumnBuilde
3031
DTColumnBuilder.newColumn(null).withTitle(titleHtml).notSortable()
3132
.renderWith(function(data, type, full, meta) {
3233
vm.selected[full.id] = false;
33-
return '<input type="checkbox" ng-model="showCase.selected[' + data.id + ']"/>';
34+
return '<input type="checkbox" ng-model="showCase.selected[' + data.id + ']"' +
35+
'ng-click="showCase.toggleOne(showCase.selected)"/>';
3436
}),
3537
DTColumnBuilder.newColumn('id').withTitle('ID'),
3638
DTColumnBuilder.newColumn('firstName').withTitle('First name'),
@@ -50,4 +52,16 @@ function RowSelect($compile, $scope, $resource, DTOptionsBuilder, DTColumnBuilde
5052
}
5153
}
5254
}
55+
function toggleOne (selectedItems) {
56+
var me = this;
57+
for (var id in selectedItems) {
58+
if (selectedItems.hasOwnProperty(id)) {
59+
if(!selectedItems[id]) {
60+
me.selectAll = false;
61+
return;
62+
}
63+
}
64+
}
65+
me.selectAll = true;
66+
}
5367
}

0 commit comments

Comments
 (0)