chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-05-14 13:34:05 +02:00
Code

Fix text overflow for subscriptions and starred feed

Browse Source
This commit is contained in:
Bernhard Posselt 2014-10-04 20:24:56 +02:00
parent 86c4a3e527
commit e63fd2677e
6 changed files with 16 additions and 13 deletions

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
owncloud-news (3.302)
* **Bugfix**: Fix text overflow for subscriptions and starred feed
owncloud-news (3.301)
* **New dependency**: ownCloud >= 7.0.3
* **Security**: Fix possible [XEE](https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing) due to race conditions on php systems using **php-fpm**

10
js/build/app.js
View File

@ -1702,8 +1702,8 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
var nextFeed = function (navigationArea) {
var current = navigationArea.find('.active');
var elements = navigationArea.find('.subscriptions:visible,' +
'.starred:visible,' +
var elements = navigationArea.find('.subscriptions-feed:visible,' +
'.starred-feed:visible,' +
'.feed:visible');
if (current.hasClass('folder')) {
@ -1735,8 +1735,8 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
var previousFeed = function (navigationArea) {
var current = navigationArea.find('.active');
var elements = navigationArea.find('.subscriptions:visible,' +
'.starred:visible,' +
var elements = navigationArea.find('.subscriptions-feed:visible,' +
'.starred-feed:visible,' +
'.feed:visible');
if (current.hasClass('folder')) {
@ -1751,7 +1751,7 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
}
// no subfeed found
var starred = $('.starred:visible');
var starred = $('.starred-feed:visible');
if (starred.length > 0) {
starred.children('a:visible').trigger('click');
}

2
js/build/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
js/gui/KeyboardShortcuts.js
View File

@ -41,8 +41,8 @@
var nextFeed = function (navigationArea) {
var current = navigationArea.find('.active');
var elements = navigationArea.find('.subscriptions:visible,' +
'.starred:visible,' +
var elements = navigationArea.find('.subscriptions-feed:visible,' +
'.starred-feed:visible,' +
'.feed:visible');
if (current.hasClass('folder')) {
@ -74,8 +74,8 @@
var previousFeed = function (navigationArea) {
var current = navigationArea.find('.active');
var elements = navigationArea.find('.subscriptions:visible,' +
'.starred:visible,' +
var elements = navigationArea.find('.subscriptions-feed:visible,' +
'.starred-feed:visible,' +
'.feed:visible');
if (current.hasClass('folder')) {
@ -90,7 +90,7 @@
}
// no subfeed found
var starred = $('.starred:visible');
var starred = $('.starred-feed:visible');
if (starred.length > 0) {
starred.children('a:visible').trigger('click');
}

2
templates/part.navigation.starredfeed.php
View File

@ -2,7 +2,7 @@
active: Navigation.isStarredActive(),
unread: Navigation.getStarredCount() > 0
}"
class="starred has-counter">
class="with-counter starred-feed">
<a class="icon-starred" ng-href="#/items/starred/">
<?php p($l->t('Starred')) ?>

2
templates/part.navigation.unreadfeed.php
View File

@ -2,7 +2,7 @@
active: Navigation.isSubscriptionsActive(),
unread: Navigation.getUnreadCount() > 0
}"
class="subscriptions has-counter has-menu">
class="subscriptions-feed with-counter with-menu">
<a class="icon-rss" ng-href="#/items/" ng-if="!Navigation.isShowAll()">
<?php p($l->t('Unread articles'))?>