Merge pull request #16 from filaruina/develop-option

Allow max-labels 0 (Will only display "(Total: X)" on the button)
isteven · Jun 5, 2014 · 76a2e83 · 76a2e83
2 parents 3550dfe + bc683e6
commit 76a2e83
Showing 1 changed file with 9 additions and 5 deletions.
diff --git 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>' );
             }