Skip to content

Commit c16972c

Browse files
authored
Merge pull request bentorfs#31 from stand579/show-tooltip
Support for optional tooltip
2 parents 7df16a6 + 3ed4708 commit c16972c

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

dist/angular-bootstrap-multiselect-templates.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ angular.module("multiselect.html", []).run(["$templateCache", function($template
2424
" </li>\n" +
2525
"\n" +
2626
" <li role=\"presentation\" ng-repeat=\"option in selectedOptions\" class=\"active\">\n" +
27-
" <a class=\"item-selected\" href=\"\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
27+
" <a class=\"item-selected\" href=\"\" title=\"{{showTooltip ? getDisplay(option) : ''}}\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
2828
" <span class=\"glyphicon glyphicon-remove\"></span>\n" +
2929
" {{getDisplay(option)}}\n" +
3030
" </a>\n" +
@@ -42,7 +42,7 @@ angular.module("multiselect.html", []).run(["$templateCache", function($template
4242
" <li role=\"presentation\" ng-repeat=\"option in unselectedOptions | filter:search() | limitTo: searchLimit\"\n" +
4343
" ng-if=\"!isSelected(option)\"\n" +
4444
" ng-class=\"{disabled : selectionLimit && selectedOptions.length >= selectionLimit}\">\n" +
45-
" <a class=\"item-unselected\" href=\"\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
45+
" <a class=\"item-unselected\" href=\"\" title=\"{{showTooltip ? getDisplay(option) : ''}}\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
4646
" {{getDisplay(option)}}\n" +
4747
" </a>\n" +
4848
" </li>\n" +

dist/angular-bootstrap-multiselect.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
showSearch: '=?',
2828
searchFilter: '=?',
2929
disabled: '=?ngDisabled',
30-
labels: '=?'
30+
labels: '=?',
31+
showTooltip: '=?'
3132
},
3233
require: 'ngModel',
3334
templateUrl: 'multiselect.html',
@@ -257,7 +258,7 @@ angular.module("multiselect.html", []).run(["$templateCache", function($template
257258
" </li>\n" +
258259
"\n" +
259260
" <li role=\"presentation\" ng-repeat=\"option in selectedOptions\" class=\"active\">\n" +
260-
" <a class=\"item-selected\" href=\"\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
261+
" <a class=\"item-selected\" href=\"\" title=\"{{showTooltip ? getDisplay(option) : ''}}\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
261262
" <span class=\"glyphicon glyphicon-remove\"></span>\n" +
262263
" {{getDisplay(option)}}\n" +
263264
" </a>\n" +
@@ -275,7 +276,7 @@ angular.module("multiselect.html", []).run(["$templateCache", function($template
275276
" <li role=\"presentation\" ng-repeat=\"option in unselectedOptions | filter:search() | limitTo: searchLimit\"\n" +
276277
" ng-if=\"!isSelected(option)\"\n" +
277278
" ng-class=\"{disabled : selectionLimit && selectedOptions.length >= selectionLimit}\">\n" +
278-
" <a class=\"item-unselected\" href=\"\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
279+
" <a class=\"item-unselected\" href=\"\" title=\"{{showTooltip ? getDisplay(option) : ''}}\" ng-click=\"toggleItem(option); $event.stopPropagation()\">\n" +
279280
" {{getDisplay(option)}}\n" +
280281
" </a>\n" +
281282
" </li>\n" +

dist/angular-bootstrap-multiselect.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/multiselect.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</li>
2121

2222
<li role="presentation" ng-repeat="option in selectedOptions" class="active">
23-
<a class="item-selected" href="" ng-click="toggleItem(option); $event.stopPropagation()">
23+
<a class="item-selected" href="" title="{{showTooltip ? getDisplay(option) : ''}}" ng-click="toggleItem(option); $event.stopPropagation()">
2424
<span class="glyphicon glyphicon-remove"></span>
2525
{{getDisplay(option)}}
2626
</a>
@@ -38,7 +38,7 @@
3838
<li role="presentation" ng-repeat="option in unselectedOptions | filter:search() | limitTo: searchLimit"
3939
ng-if="!isSelected(option)"
4040
ng-class="{disabled : selectionLimit && selectedOptions.length >= selectionLimit}">
41-
<a class="item-unselected" href="" ng-click="toggleItem(option); $event.stopPropagation()">
41+
<a class="item-unselected" href="" title="{{showTooltip ? getDisplay(option) : ''}}" ng-click="toggleItem(option); $event.stopPropagation()">
4242
{{getDisplay(option)}}
4343
</a>
4444
</li>

src/multiselect.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
showSearch: '=?',
2828
searchFilter: '=?',
2929
disabled: '=?ngDisabled',
30-
labels: '=?'
30+
labels: '=?',
31+
showTooltip: '=?'
3132
},
3233
require: 'ngModel',
3334
templateUrl: 'multiselect.html',

0 commit comments

Comments
 (0)