mirror of
https://github.com/chylex/Nextcloud-News.git
synced 2025-04-09 10:15:44 +02:00
fix #134
This commit is contained in:
parent
d630b2cf81
commit
c8b8ee69d1
css
js
templates
@ -23,7 +23,8 @@
|
||||
display: table-cell;
|
||||
}
|
||||
|
||||
#articles, #app-content-wrapper {
|
||||
#articles,
|
||||
#app-content-wrapper {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@ -64,18 +65,25 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
#app-content:not(.explore):after {
|
||||
#app-content:not(.explore) #articles:after {
|
||||
content: '';
|
||||
display: block;
|
||||
height: 100%;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
#app-content-wrapper.autopaging:after {
|
||||
#app-content .autopaging: #articles:after {
|
||||
content: '';
|
||||
background-image: url('../img/loading.gif') no-repeat;
|
||||
background-image: url('../img/loading.gif');
|
||||
background-position: calc(50% - 16px) calc(50% - 16px);
|
||||
}
|
||||
|
||||
#app-content .finished-auto-paging #articles:after {
|
||||
background-image: url('../img/rss.svg');
|
||||
background-size: 26px;
|
||||
background-position: calc(50% - 13px) calc(50% - 13px);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
|
2
css/news-owncloud7.min.css
vendored
2
css/news-owncloud7.min.css
vendored
File diff suppressed because one or more lines are too long
2
css/news.min.css
vendored
2
css/news.min.css
vendored
File diff suppressed because one or more lines are too long
@ -285,6 +285,7 @@ app.controller('ContentController',
|
||||
|
||||
|
||||
this.isAutoPagingEnabled = true;
|
||||
this.isNothingMoreToAutoPage = false;
|
||||
|
||||
this.getItems = function () {
|
||||
return ItemResource.getAll();
|
||||
@ -391,6 +392,8 @@ app.controller('ContentController',
|
||||
|
||||
if (data.items.length > 0) {
|
||||
self.isAutoPagingEnabled = true;
|
||||
} else {
|
||||
self.isNothingMoreToAutoPage = true;
|
||||
}
|
||||
|
||||
if (self.isAutoPagingEnabled && self.autoPageAgain) {
|
||||
|
2
js/build/app.min.js
vendored
2
js/build/app.min.js
vendored
File diff suppressed because one or more lines are too long
@ -20,6 +20,7 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data,
|
||||
|
||||
|
||||
this.isAutoPagingEnabled = true;
|
||||
this.isNothingMoreToAutoPage = false;
|
||||
|
||||
this.getItems = function () {
|
||||
return ItemResource.getAll();
|
||||
@ -126,6 +127,8 @@ function (Publisher, FeedResource, ItemResource, SettingsResource, data,
|
||||
|
||||
if (data.items.length > 0) {
|
||||
self.isAutoPagingEnabled = true;
|
||||
} else {
|
||||
self.isNothingMoreToAutoPage = true;
|
||||
}
|
||||
|
||||
if (self.isAutoPagingEnabled && self.autoPageAgain) {
|
||||
|
@ -91,7 +91,10 @@ if (defined('DEBUG') && DEBUG === true) {
|
||||
tabindex="-1"
|
||||
news-pull-to-refresh="showPullToRefresh">
|
||||
<div id="app-content-wrapper"
|
||||
ng-class="{'autopaging': App.loading.isLoading('autopaging')}"
|
||||
ng-class="{
|
||||
'autopaging': App.loading.isLoading('autopaging'),
|
||||
'finished-auto-paging': Content.isNothingMoreToAutoPage
|
||||
}"
|
||||
ng-hide="App.loading.isLoading('global')"
|
||||
ng-view
|
||||
news-scroll="#app-content"
|
||||
|
@ -13,7 +13,7 @@
|
||||
<?php p($l->t('Refresh')) ?> (r)
|
||||
</button>
|
||||
</div>
|
||||
<div ng-if="Content.getItems().length == 0" class="no-feeds-available">
|
||||
<div ng-show="Content.getItems().length == 0" class="no-feeds-available">
|
||||
<p ng-show="Content.isShowAll()"><?php p($l->t('No articles available')) ?></p>
|
||||
<p ng-show="!Content.isShowAll()"><?php p($l->t('No unread articles available')) ?></p>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user