summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-09-01 00:31:36 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-09-01 00:31:36 +0200
commit2ec1f71203e7312932e7545493fa2153dc261c88 (patch)
treecc3b7496a641c85f0cc5a3994b8acb983e96c44c /js
parent6d0b9b4f2ba2f89b283671944cfcbefb4702d31d (diff)
more whitespace for oc6
Diffstat (limited to 'js')
-rw-r--r--js/app/services/unreadcountformatter.coffee4
-rw-r--r--js/public/app.js4
-rw-r--r--js/tests/controllers/feedcontrollerSpec.coffee4
-rw-r--r--js/tests/services/unreadcountformaterSpec.coffee8
4 files changed, 10 insertions, 10 deletions
diff --git a/js/app/services/unreadcountformatter.coffee b/js/app/services/unreadcountformatter.coffee
index ec45bc21e..d89e7b59d 100644
--- a/js/app/services/unreadcountformatter.coffee
+++ b/js/app/services/unreadcountformatter.coffee
@@ -23,6 +23,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
angular.module('News').factory 'unreadCountFormatter', ->
return (unreadCount) ->
- if unreadCount > 99
- unreadCount = '99+'
+ if unreadCount > 999
+ unreadCount = '999+'
return unreadCount \ No newline at end of file
diff --git a/js/public/app.js b/js/public/app.js
index b5eef7e34..a4dda620b 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -3236,8 +3236,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
(function() {
angular.module('News').factory('unreadCountFormatter', function() {
return function(unreadCount) {
- if (unreadCount > 99) {
- unreadCount = '99+';
+ if (unreadCount > 999) {
+ unreadCount = '999+';
}
return unreadCount;
};
diff --git a/js/tests/controllers/feedcontrollerSpec.coffee b/js/tests/controllers/feedcontrollerSpec.coffee
index aecc858f9..01170509d 100644
--- a/js/tests/controllers/feedcontrollerSpec.coffee
+++ b/js/tests/controllers/feedcontrollerSpec.coffee
@@ -93,13 +93,13 @@ describe 'FeedController', ->
it 'should show 99+ if in window title when more than 99 unread count', =>
item = {id: 3, unreadCount: 1, faviconLink: 'test', url: 'hi'}
- item1 = {id: 5, unreadCount: 99, faviconLink: 'test', url: 'his'}
+ item1 = {id: 5, unreadCount: 999, faviconLink: 'test', url: 'his'}
@FeedModel.add(item)
@FeedModel.add(item1)
@scope.getTotalUnreadCount()
- expect(@$window.document.title).toBe('News (99+) | ownCloud')
+ expect(@$window.document.title).toBe('News (999+) | ownCloud')
it 'should move a feed if moveFeedToFolder is broadcasted', =>
diff --git a/js/tests/services/unreadcountformaterSpec.coffee b/js/tests/services/unreadcountformaterSpec.coffee
index 86deab2af..9e61f8525 100644
--- a/js/tests/services/unreadcountformaterSpec.coffee
+++ b/js/tests/services/unreadcountformaterSpec.coffee
@@ -27,9 +27,9 @@ describe 'unreadCountFormatter', ->
beforeEach inject (@unreadCountFormatter) =>
- it 'should return the normal count if its below 99', =>
- expect(@unreadCountFormatter(99)).toBe(99)
+ it 'should return the normal count if its below 999', =>
+ expect(@unreadCountFormatter(999)).toBe(999)
- it 'should set the count to 99+ if the count is over 99', =>
- expect(@unreadCountFormatter(100)).toBe('99+') \ No newline at end of file
+ it 'should set the count to 999+ if the count is over 999', =>
+ expect(@unreadCountFormatter(1000)).toBe('999+') \ No newline at end of file