summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--angular-multi-select.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/angular-multi-select.js b/angular-multi-select.js
index 33d5c60..dd610f4 100644
--- a/angular-multi-select.js
+++ b/angular-multi-select.js
@@ -181,9 +181,9 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
if ( $scope.selectedItems.length === 0 ) {
$scope.varButtonLabel = 'None selected';
}
- else {
+ else {
var tempMaxLabels = $scope.selectedItems.length;
- if ( typeof $scope.maxLabels !== 'undefined' && $scope.maxLabels !== '' && $scope.maxLabels !== "0" ) {
+ if ( typeof $scope.maxLabels !== 'undefined' && $scope.maxLabels !== '' ) {
tempMaxLabels = $scope.maxLabels;
}
@@ -202,11 +202,15 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$
}
ctr++;
}
- });
+ });
if ( $scope.more === true ) {
- $scope.varButtonLabel += ', ... (Total: ' + $scope.selectedItems.length + ')';
- }$scope
+ if (tempMaxLabels > 0) {
+ $scope.varButtonLabel += ', ... ';
+ }
+
+ $scope.varButtonLabel += '(Total: ' + $scope.selectedItems.length + ')';
+ }
}
$scope.varButtonLabel = $sce.trustAsHtml( $scope.varButtonLabel + '<span class="multiSelect caret"></span>' );
}