Skip to content

Commit 76a2e83

Browse files
committed
Merge pull request #16 from filaruina/develop-option
Allow max-labels 0 (Will only display "(Total: X)" on the button)
2 parents 3550dfe + bc683e6 commit 76a2e83

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

angular-multi-select.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
181181
if ( $scope.selectedItems.length === 0 ) {
182182
$scope.varButtonLabel = 'None selected';
183183
}
184-
else {
184+
else {
185185
var tempMaxLabels = $scope.selectedItems.length;
186-
if ( typeof $scope.maxLabels !== 'undefined' && $scope.maxLabels !== '' && $scope.maxLabels !== "0" ) {
186+
if ( typeof $scope.maxLabels !== 'undefined' && $scope.maxLabels !== '' ) {
187187
tempMaxLabels = $scope.maxLabels;
188188
}
189189

@@ -202,11 +202,15 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
202202
}
203203
ctr++;
204204
}
205-
});
205+
});
206206

207207
if ( $scope.more === true ) {
208-
$scope.varButtonLabel += ', ... (Total: ' + $scope.selectedItems.length + ')';
209-
}$scope
208+
if (tempMaxLabels > 0) {
209+
$scope.varButtonLabel += ', ... ';
210+
}
211+
212+
$scope.varButtonLabel += '(Total: ' + $scope.selectedItems.length + ')';
213+
}
210214
}
211215
$scope.varButtonLabel = $sce.trustAsHtml( $scope.varButtonLabel + '<span class="multiSelect caret"></span>' );
212216
}

0 commit comments

Comments
 (0)