Skip to content
This repository was archived by the owner on Dec 16, 2019. It is now read-only.

Commit a3e39fa

Browse files
committed
Merge branch 'master' into Version-1.9.0
2 parents bf38fa1 + 4558c74 commit a3e39fa

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pages/javascripts/pages/home/home.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,13 @@ <h2>Attributes</h2>
10281028
<td>String</td>
10291029
<td>Uses for settings the search filter from outside the direcrtive.</td>
10301030
</tr>
1031+
<tr>
1032+
<td>
1033+
<strong>disabled</strong>
1034+
</td>
1035+
<td>Boolean</td>
1036+
<td>Used for disabling the dropdown.</td>
1037+
</tr>
10311038
</tbody>
10321039
</table>
10331040
<h2>Settings</h2>

src/angularjs-dropdown-multiselect.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ directiveModule.directive('ngDropdownMultiselect', ['$filter', '$document', '$co
2222
events: '=',
2323
searchFilter: '=?',
2424
translationTexts: '=',
25-
groupBy: '@'
25+
groupBy: '@',
26+
disabled: "="
2627
},
2728
template: function (element, attrs) {
2829
var checkboxes = attrs.checkboxes ? true : false;
2930
var groups = attrs.groupBy ? true : false;
3031

3132
var template = '<div class="multiselect-parent btn-group dropdown-multiselect">';
32-
template += '<button type="button" class="dropdown-toggle" ng-class="settings.buttonClasses" ng-click="toggleDropdown()">{{getButtonText()}}&nbsp;<span class="caret"></span></button>';
33+
template += '<button ng-disabled="disabled" type="button" class="dropdown-toggle" ng-class="settings.buttonClasses" ng-click="toggleDropdown()">{{getButtonText()}}&nbsp;<span class="caret"></span></button>';
3334
template += '<ul class="dropdown-menu dropdown-menu-form" ng-if="open" ng-style="{display: open ? \'block\' : \'none\', height : settings.scrollable ? settings.scrollableHeight : \'auto\', overflow: \'auto\' }" >';
3435
template += '<li ng-if="settings.showCheckAll && settings.selectionLimit !== 1"><a ng-keydown="keyDownLink($event)" data-ng-click="selectAll()" tabindex="-1" id="selectAll"><span class="glyphicon glyphicon-ok"></span> {{texts.checkAll}}</a>';
3536
template += '<li ng-if="settings.showUncheckAll"><a ng-keydown="keyDownLink($event)" data-ng-click="deselectAll();" tabindex="-1" id="deselectAll"><span class="glyphicon glyphicon-remove"></span> {{texts.uncheckAll}}</a></li>';

0 commit comments

Comments
 (0)