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

🔥 Remove changes from front-end for back-end pr

Browse Source 
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
This commit is contained in:
Marco Nassabain 2021-03-02 22:53:58 +01:00 committed by Sean Molenaar
parent f708e40b75
commit a1edb03e19
7 changed files with 7 additions and 31 deletions

6
js/app/Config.js
View File

@ -191,12 +191,6 @@ app.config(function ($routeProvider, $provide, $httpProvider, $locationProvider)
resolve: getItemResolve(feedType.STARRED),
type: feedType.STARRED
})
.when('/items/shared', {
controller: 'ContentController as Content',
templateUrl: 'content.html',
resolve: getItemResolve(feedType.SHARED),
type: feedType.SHARED
})
.when('/items/unread', {
controller: 'ContentController as Content',
templateUrl: 'content.html',

4
js/app/Run.js
View File

@ -45,10 +45,6 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading,
url = '/items/starred';
break;
case FEED_TYPE.SHARED:
url = '/items/shared';
break;
case FEED_TYPE.EXPLORE:
url = '/explore';
break;

14
js/controller/ContentController.js
View File

@ -89,9 +89,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou
if (!item.keepUnread && item.unread === true) {
ItemResource.markItemRead(itemId);
if (item.isShared === false) {
FeedResource.markItemOfFeedRead(item.feedId);
}
FeedResource.markItemOfFeedRead(item.feedId);
}
};
@ -103,9 +101,7 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou
var item = ItemResource.get(itemId);
if (!item.unread) {
ItemResource.markItemRead(itemId, false);
if (item.isShared === false) {
FeedResource.markItemOfFeedUnread(item.feedId);
}
FeedResource.markItemOfFeedUnread(item.feedId);
}
item.keepUnread = !item.keepUnread;
@ -140,10 +136,8 @@ app.controller('ContentController', function (Publisher, FeedResource, ItemResou
itemIds.forEach(function (itemId) {
var item = ItemResource.get(itemId);
if (!item.keepUnread) {
if (item.isShared === false) {
ids.push(itemId);
feedIds.push(item.feedId);
}
ids.push(itemId);
feedIds.push(item.feedId);
}
});

1
l10n/fr.js
View File

@ -38,7 +38,6 @@ OC.L10N.register(
"Remove keep article unread" : "Marquer l'article comme lu",
"by" : "par",
"from" : "de",
"shared from": "partagé par",
"Play audio" : "Ecouter",
"Download audio" : "Télécharger le son",
"Download video" : "Télécharger la vidéo",

1
l10n/fr.json
View File

@ -36,7 +36,6 @@
"Remove keep article unread" : "Marquer l'article comme lu",
"by" : "par",
"from" : "de",
"shared from" : "partagé par",
"Play audio" : "Ecouter",
"Download audio" : "Télécharger le son",
"Download video" : "Télécharger la vidéo",

10
templates/part.content.php
View File

@ -122,18 +122,12 @@
<span class="author" ng-show="item.author">
<?php p($l->t('by')) ?> {{ ::item.author }}
</span>
<span ng-if="item.sharedBy == ''" class="source"><?php p($l->t('from')) ?>
<a ng-href="#/items/feeds/{{ item.feedId }}/">
<span class="source"><?php p($l->t('from')) ?>
<a ng-href="#/items/feeds/{{ ::item.feedId }}/">
{{ ::Content.getFeed(item.feedId).title }}
<img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon">
</a>
</span>
<span ng-if="item.sharedBy != ''" class="source"><?php p($l->t('shared from')) ?>
<a ng-href="#/items/feeds/{{ item.feedId }}/">
{{ :: item.sharedBy}}
<img ng-if="Content.getFeed(item.feedId).faviconLink && !Content.isCompactView()" src="{{ ::Content.getFeed(item.feedId).faviconLink }}" alt="favicon">
</a>
</span>
</div>
<div class="enclosure" ng-if="Content.getMediaType(item.enclosureMime) == 'audio'">

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

@ -4,7 +4,7 @@
}"
class="with-counter starred-feed">
<a class="icon-starred" ng-href="#/items/shared/">
<a class="icon-starred" ng-href="#/items/starred/">
<?php p($l->t('Starred')) ?>
</a>