chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-04-09 10:15:44 +02:00
Code

version bump

Browse Source
This commit is contained in:
Bernhard Posselt 2013-09-16 20:20:23 +02:00
parent 2937a633de
commit d9f1aca951
6 changed files with 26 additions and 16 deletions

3
CHANGELOG
View File

@ -1,3 +1,6 @@
owncloud-news (1.603)
* Fix JavaScript errors which prevented the translation elements from being removed
owncloud-news (1.602)
* Remove removed class from container
* Go back to allow feeds per url from input

2
appinfo/info.xml
View File

@ -5,6 +5,6 @@
<description>An RSS/Atom feed reader. Requires the App Framework app and backgroundjobs need to be enabled. See the README.rst in the apps top directory</description>
<licence>AGPL</licence>
<author>Alessandro Cosentino, Bernhard Posselt, Jan-Christoph Borchardt. Powered by SimplePie (Ryan Parman, Geoffrey Sneddon, Ryan McCue and contributors).</author>
<version>1.602</version>
<version>1.603</version>
<require>5.0.6</require>
</info>

2
appinfo/version
View File

@ -1 +1 @@
1.602
1.603

9
js/app/controllers/feedcontroller.coffee
View File

@ -54,11 +54,16 @@ ActiveFeed, FeedType, $window) ->
# dont do this for other dom elements
# the title is some kind of exception since its always there
# and it has nothing to do with the body structure
if @_$scope.translations and @_$scope.translations.appName
appName = @_$scope.translations.appName
else
appName = ''
if count > 0
titleCount = @_unreadCountFormatter(count)
title = @_$scope.translations.appName + ' (' + titleCount + ') | ownCloud'
title = appName + ' (' + titleCount + ') | ownCloud'
else
title = @_$scope.translations.appName + ' | ownCloud'
title = appName + ' | ownCloud'
# only update title when it changed to prevent highlighting the
# tab

7
js/app/directives/translate.coffee
View File

@ -26,7 +26,6 @@ angular.module('News').directive 'newsTranslate', ->
directive =
restrict: 'E'
link: (scope, element, attributes) ->
$element = $(element)
scope.translations or= scope.translations
scope.translations[attributes.key] = $element.text()
$element.remove()
scope.translations = scope.translations || {}
scope.translations[attributes.key] = element.text()
element.remove()

19
js/public/app.js
View File

@ -508,11 +508,9 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
return directive = {
restrict: 'E',
link: function(scope, element, attributes) {
var $element;
$element = $(element);
scope.translations || (scope.translations = scope.translations);
scope.translations[attributes.key] = $element.text();
return $element.remove();
scope.translations = scope.translations || {};
scope.translations[attributes.key] = element.text();
return element.remove();
}
};
});
@ -682,13 +680,18 @@ 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, title, titleCount;
var appName, count, title, titleCount;
count = _this._subscriptionsBusinessLayer.getUnreadCount(0);
if (_this._$scope.translations && _this._$scope.translations.appName) {
appName = _this._$scope.translations.appName;
} else {
appName = '';
}
if (count > 0) {
titleCount = _this._unreadCountFormatter(count);
title = _this._$scope.translations.appName + ' (' + titleCount + ') | ownCloud';
title = appName + ' (' + titleCount + ') | ownCloud';
} else {
title = _this._$scope.translations.appName + ' | ownCloud';
title = appName + ' | ownCloud';
}
if (_this._$window.document.title !== title) {
_this._$window.document.title = title;