diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-21 23:09:43 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-21 23:09:43 +0000 |
commit | 6c12cbd05ae8e0a365e6241191dcfaa4d306ed31 (patch) | |
tree | ea00a18af374928a344c8ac8480d5ef7007bf198 /app/assets/javascripts | |
parent | deb62183edbd9111691f62a4f6a9febb1fcd79f7 (diff) | |
parent | 0a53a3d9664187cbd8c72c24666a8ff03f3dccec (diff) | |
download | gitlab-ce-6c12cbd05ae8e0a365e6241191dcfaa4d306ed31.tar.gz |
Merge branch '26703-todos-count' into 'master'
#26703 change todos counter position & format ( for large counts )
Closes #26703
See merge request !9171
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/header.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/lib/utils/text_utility.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/header.js b/app/assets/javascripts/header.js index fa85f9a6c86..a853c3aeb1f 100644 --- a/app/assets/javascripts/header.js +++ b/app/assets/javascripts/header.js @@ -2,7 +2,7 @@ (function() { $(document).on('todo:toggle', function(e, count) { var $todoPendingCount = $('.todos-pending-count'); - $todoPendingCount.text(gl.text.addDelimiter(count)); + $todoPendingCount.text(gl.text.highCountTrim(count)); $todoPendingCount.toggleClass('hidden', count === 0); }); })(); diff --git a/app/assets/javascripts/lib/utils/text_utility.js b/app/assets/javascripts/lib/utils/text_utility.js index f755d212b3c..579d322e3fb 100644 --- a/app/assets/javascripts/lib/utils/text_utility.js +++ b/app/assets/javascripts/lib/utils/text_utility.js @@ -14,6 +14,9 @@ require('vendor/latinise'); gl.text.addDelimiter = function(text) { return text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : text; }; + gl.text.highCountTrim = function(count) { + return count > 99 ? '99+' : count; + }; gl.text.randomString = function() { return Math.random().toString(36).substring(7); }; |