diff options
| -rw-r--r-- | js/app/controllers/feedcontroller.coffee | 5 | ||||
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 5 | ||||
| -rw-r--r-- | js/app/services/businesslayer/itembusinesslayer.coffee | 2 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 2 | ||||
| -rw-r--r-- | js/public/app.js | 6 | ||||
| -rw-r--r-- | js/tests/services/persistenceSpec.coffee | 2 | ||||
| -rw-r--r-- | templates/part.feed.starred.php | 2 | ||||
| -rw-r--r-- | templates/part.feed.unread.php | 2 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 2 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 2 |
10 files changed, 16 insertions, 14 deletions
diff --git a/js/app/controllers/feedcontroller.coffee b/js/app/controllers/feedcontroller.coffee index 2d1147b23..41e4fa07d 100644 --- a/js/app/controllers/feedcontroller.coffee +++ b/js/app/controllers/feedcontroller.coffee @@ -55,8 +55,9 @@ ActiveFeed, FeedType, $window) -> # the title is some kind of exception since its always there # and it has nothing to do with the body structure if count > 0 - count = @_unreadCountFormatter(count) - @_$window.document.title = 'News (' + count + ') | ownCloud' + titleCount = @_unreadCountFormatter(count) + @_$window.document.title = + 'News (' + titleCount + ') | ownCloud' else @_$window.document.title = 'News | ownCloud' return count diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 804b68423..796a6a6eb 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -26,7 +26,7 @@ angular.module('News').factory 'FeedBusinessLayer', 'ItemModel', 'FeedModel', 'NewLoading', '_ExistsError', 'Utils', '$rootScope', 'UndoQueue', 'NewestItem', (_BusinessLayer, ShowAll, Persistence, ActiveFeed, FeedType, ItemModel, -FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem) -> +FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem)-> class FeedBusinessLayer extends _BusinessLayer @@ -185,7 +185,8 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, UndoQueue, NewestItem) - url: url folderId: 0 unreadCount: 0 - faviconLink: 'url('+@_utils.imagePath('core', 'loading.gif')+')' + faviconLink: 'url(' + + @_utils.imagePath('core', 'loading.gif') + ')' @_feedModel.add(feed) diff --git a/js/app/services/businesslayer/itembusinesslayer.coffee b/js/app/services/businesslayer/itembusinesslayer.coffee index 6d12661ff..7a2063a97 100644 --- a/js/app/services/businesslayer/itembusinesslayer.coffee +++ b/js/app/services/businesslayer/itembusinesslayer.coffee @@ -109,7 +109,7 @@ StarredBusinessLayer, NewestItem) -> size = @_itemModel.size() if size != 0 @_persistence.getItems @_activeFeed.getType(), - @_activeFeed.getId(), + @_activeFeed.getId(), size, @_newestItem.getId(), callback diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 8eea196db..92ced046b 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -69,7 +69,7 @@ $rootScope) -> loading.decrease() params = - data: + data: limit: @_config.itemBatchSize offset: offset id: id diff --git a/js/public/app.js b/js/public/app.js index 80a678995..e38c84d59 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -425,12 +425,12 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. this._$scope.starredBusinessLayer = this._starredBusinessLayer; this._$scope.unreadCountFormatter = this._unreadCountFormatter; this._$scope.getTotalUnreadCount = function() { - var count; + var count, titleCount; count = _this._subscriptionsBusinessLayer.getUnreadCount(0); if (count > 0) { - count = _this._unreadCountFormatter(count); - _this._$window.document.title = 'News (' + count + ') | ownCloud'; + titleCount = _this._unreadCountFormatter(count); + _this._$window.document.title = 'News (' + titleCount + ') | ownCloud'; } else { _this._$window.document.title = 'News | ownCloud'; } diff --git a/js/tests/services/persistenceSpec.coffee b/js/tests/services/persistenceSpec.coffee index 91d732c5e..b0a057d16 100644 --- a/js/tests/services/persistenceSpec.coffee +++ b/js/tests/services/persistenceSpec.coffee @@ -60,7 +60,7 @@ describe 'Persistence', -> onSuccess: -> @Persistence.getItems(params.data.type, params.data.id, - params.data.offset, params.data.newestItemId, + params.data.offset, params.data.newestItemId, params.onSuccess) expected = diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php index 2af6f21ff..15f5e0a07 100644 --- a/templates/part.feed.starred.php +++ b/templates/part.feed.starred.php @@ -12,7 +12,7 @@ </a> <span class="utils"> <span class="unread-counter"> - {{ starredBusinessLayer.getUnreadCount() }} + {{ unreadCountFormatter(starredBusinessLayer.getUnreadCount()) }} </span> </span> </li>
\ No newline at end of file diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index c5609f60a..96df79af4 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -19,7 +19,7 @@ <span class="utils"> <span class="unread-counter" ng-show="getTotalUnreadCount() > 0"> - {{ getTotalUnreadCount() }} + {{ unreadCountFormatter(getTotalUnreadCount()) }} </span> <button class="svg action mark-read-icon" ng-click="subscriptionsBusinessLayer.markAllRead()" diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 727d90197..1309da9df 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -33,7 +33,7 @@ <span class="unread-counter" ng-show="feed.id && feedBusinessLayer.getUnreadCount(feed.id) > 0"> - {{ feedBusinessLayer.getUnreadCount(feed.id) }} + {{ unreadCountFormatter(feedBusinessLayer.getUnreadCount(feed.id)) }} </span> <button class="svg action mark-read-icon" diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index e007b6faa..b2404b3f1 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -34,7 +34,7 @@ <span class="unread-counter" ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0"> - {{ folderBusinessLayer.getUnreadCount(folder.id) }} + {{ unreadCountFormatter(folderBusinessLayer.getUnreadCount(folder.id)) }} </span> <button class="svg action mark-read-icon" |