garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

Merge pull request #846 from sometoby/tinycon-unread-badge

Browse Source 
Use tinycon to display unread article count
This commit is contained in:
Jérémie Panzer
2017-08-18 14:25:07 +02:00
committed by GitHub
parent f381974955 aef76db664
commit eeeaffd883
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@@ -1,3 +1,6 @@
v 2.5.0
- unread count is now displayed in a favicon badge when supported
v 2.4.0 v 2.4.0
- users were not able to change password or delete account - users were not able to change password or delete account
- fix api key generation - fix api key generation
@@ -51,4 +54,4 @@ v2.0.0
- The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances. - The backend has been completely rewritten using Dropwizard instead of TomEE, resulting in a lot less memory consumption and better overall performances.
See the README on how to build CommaFeed from now on. See the README on how to build CommaFeed from now on.
- CommaFeed should no longer fetch the same feed multiple times in a row - CommaFeed should no longer fetch the same feed multiple times in a row
- Users can use their username or email to log in - Users can use their username or email to log in

3
bower.json
View File

@@ -28,7 +28,8 @@
"devicejs": "0.2.4", "devicejs": "0.2.4",
"readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c", "readabilicons": "arc90/readability-readabilicons#34c55561c5b8ec6e90714b50237c06b13cb9d59c",
"zocial-less": "1.0.0", "zocial-less": "1.0.0",
"swagger-ui": "2.1.0" "swagger-ui": "2.1.0",
"tinycon": "0.6.5"
}, },
"resolutions": { "resolutions": {
"angular": "1.3.14", "angular": "1.3.14",

1
src/main/app/index.html
View File

@@ -70,6 +70,7 @@
<script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script> <script type="text/javascript" src="lib/mousetrap/mousetrap.js"></script>
<script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script> <script type="text/javascript" src="lib/momentjs/min/moment-with-locales.js"></script>
<script type="text/javascript" src="lib/devicejs/lib/device.js"></script> <script type="text/javascript" src="lib/devicejs/lib/device.js"></script>
<script type="text/javascript" src="lib/tinycon/tinycon.js"></script>
<script type="text/javascript" src="js/controllers.js"></script> <script type="text/javascript" src="js/controllers.js"></script>
<script type="text/javascript" src="js/directives.js"></script> <script type="text/javascript" src="js/directives.js"></script>

6
src/main/app/js/controllers.js
View File

@@ -194,11 +194,7 @@ module.controller('CategoryTreeCtrl', [
}; };
$scope.$watch(rootUnreadCount, function(value) { $scope.$watch(rootUnreadCount, function(value) {
var label = 'CommaFeed'; Tinycon.setBubble(value);
if (value > 0) {
label = '(' + value + ') ' + label;
}
$window.document.title = label;
}); });
var mark = function(node, entry) { var mark = function(node, entry) {