diff options
author | suntala <suntala@hotmail.com> | 2018-04-11 17:34:56 +0200 |
---|---|---|
committer | suntala <suntala@hotmail.com> | 2018-04-11 17:34:56 +0200 |
commit | ad957b6d07c6082f5dc5e60aaf4c56e027803a58 (patch) | |
tree | 02bcf90644cf4eefcbb3c434a64ea9959d1a4026 | |
parent | f8b8496f5aad9d56beb01bdbbb3e7f1afee4431c (diff) |
Fix issue 445 to display number of contacts in tooltips.
-rw-r--r-- | js/filters/counterTooltipDisplay_filter.js | 12 | ||||
-rw-r--r-- | js/tests/filters/counterTooltipDisplay_filter.js | 20 | ||||
-rw-r--r-- | templates/contactFilter.html | 7 |
3 files changed, 37 insertions, 2 deletions
diff --git a/js/filters/counterTooltipDisplay_filter.js b/js/filters/counterTooltipDisplay_filter.js new file mode 100644 index 00000000..e9704a38 --- /dev/null +++ b/js/filters/counterTooltipDisplay_filter.js @@ -0,0 +1,12 @@ +angular.module('contactsApp') +.filter('counterTooltipDisplay', function () { + 'use strict'; + return function (count) { + if (count > 9999) { + return count; + } + return ''; + }; +}); + + diff --git a/js/tests/filters/counterTooltipDisplay_filter.js b/js/tests/filters/counterTooltipDisplay_filter.js new file mode 100644 index 00000000..0eef1f61 --- /dev/null +++ b/js/tests/filters/counterTooltipDisplay_filter.js @@ -0,0 +1,20 @@ +describe('counterTooltipDisplay filter', function() { + + var $filter; + + beforeEach(module('contactsApp')); + + beforeEach(inject(function(_$filter_){ + $filter = _$filter_; + })); + + it('should return the empty string if less than 10000 and the actual number if greater than 9999', function() { + var counterTooltipDisplay = $filter('counterTooltipDisplay'); + expect(counterTooltipDisplay(Number.NaN)).to.equal(''); + expect(counterTooltipDisplay(15)).to.equal(''); + expect(counterTooltipDisplay(0)).to.equal(''); + expect(counterTooltipDisplay(-5)).to.equal(''); + expect(counterTooltipDisplay(9999)).to.equal(''); + expect(counterTooltipDisplay(10000)).to.equal(10000); + }); +});
\ No newline at end of file diff --git a/templates/contactFilter.html b/templates/contactFilter.html index 28755f5d..8dbbc6ba 100644 --- a/templates/contactFilter.html +++ b/templates/contactFilter.html @@ -1,6 +1,9 @@ <a ng-href="#/{{ctrl.contactFilter.name}}">{{ ctrl.contactFilter.name }}</a> <div class="app-navigation-entry-utils"> <ul> - <li class="app-navigation-entry-utils-counter">{{ctrl.contactFilter.count | counterFormatter}}</li> + <li class="app-navigation-entry-utils-counter" tooltip-placement="right" + uib-tooltip="{{ctrl.contactFilter.count | counterTooltipDisplay}}" tooltip-append-to-body="true"> + {{ctrl.contactFilter.count | counterFormatter}} + </li> </ul> -</div> +</div>
\ No newline at end of file |