diff options
| author | isteven <isteven@server.fake> | 2014-07-07 12:01:10 +0800 |
|---|---|---|
| committer | isteven <isteven@server.fake> | 2014-07-07 12:01:10 +0800 |
| commit | aa1e51ce77f89358b825677a4a17429ce6dece57 (patch) | |
| tree | 084cdad98d79ded5eefd1d0a4a5397d131872e1c /angular-multi-select.js | |
| parent | e6106e658c18d3511ffa53e861a83f87ff1f3962 (diff) | |
| download | angular-multi-select-aa1e51ce77f89358b825677a4a17429ce6dece57.zip angular-multi-select-aa1e51ce77f89358b825677a4a17429ce6dece57.tar.gz angular-multi-select-aa1e51ce77f89358b825677a4a17429ce6dece57.tar.bz2 | |
v2.0.0
Diffstat (limited to 'angular-multi-select.js')
| -rw-r--r-- | angular-multi-select.js | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/angular-multi-select.js b/angular-multi-select.js index 7303061..003c3ce 100644 --- a/angular-multi-select.js +++ b/angular-multi-select.js @@ -65,18 +65,6 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$ onClose : '&', onItemClick : '&', onOpen : '&' -======= - orientation : '@', - defaultLabel : '@', - maxLabels : '@', - isDisabled : '=', - directiveId : '@', - helperElements : '@', - onOpen : '&', - onClose : '&', - onBlur : '&', - onFocus : '&', ->>>>>>> 93c81c29e84ff5859b4d4b294b04687f2198493e }, template: @@ -454,7 +442,7 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$ // https://github.com/isteven/angular-multi-select/pull/19 $scope.varButtonLabel = ( typeof $scope.defaultLabel !== 'undefined' ) ? $scope.defaultLabel : 'None selected'; } - else { + else { var tempMaxLabels = $scope.selectedItems.length; if ( typeof $scope.maxLabels !== 'undefined' && $scope.maxLabels !== '' ) { tempMaxLabels = $scope.maxLabels; @@ -475,7 +463,7 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$ } ctr++; } - }); + }); if ( $scope.more === true ) { // https://github.com/isteven/angular-multi-select/pull/16 @@ -483,7 +471,6 @@ angular.module( 'multi-select', ['ng'] ).directive( 'multiSelect' , [ '$sce', '$ $scope.varButtonLabel += ', ... '; } $scope.varButtonLabel += '(Total: ' + $scope.selectedItems.length + ')'; - } } $scope.varButtonLabel = $sce.trustAsHtml( $scope.varButtonLabel + '<span class="caret"></span>' ); |