aboutsummaryrefslogtreecommitdiff
path: root/p/scripts
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-03-11 10:36:48 +0100
committerGravatar GitHub <noreply@github.com> 2017-03-11 10:36:48 +0100
commitbe0bcfef7e38f27284ec7b377b342ba389515964 (patch)
tree59d2d5a8e34fcb279a53a2b44fde1e36c888672d /p/scripts
parent5f637bd816b7323885bfe1751a1724ee59a822f6 (diff)
parentb34c318f02574b13560731035fd5a4f750aa1e9b (diff)
Merge pull request #1455 from FreshRSS/dev1.6.3
Release 1.6.3
Diffstat (limited to 'p/scripts')
-rw-r--r--p/scripts/main.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 14e0c5be5..5dbb95c91 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -117,6 +117,7 @@ function incUnreadsFeed(article, feed_id, nb) {
var pending_entries = {};
function mark_read(active, only_not_read) {
if ((active.length === 0) || (!active.attr('id')) ||
+ context.anonymous ||
(only_not_read && !active.hasClass("not_read"))) {
return false;
}
@@ -935,6 +936,8 @@ function notifs_html5_show(nb) {
notification.onclick = function() {
window.location.reload();
+ window.focus();
+ notification.close();
};
if (context.html5_notif_timeout !== 0) {
@@ -1014,6 +1017,7 @@ function load_more_posts() {
init_load_more(box_load_more);
$('#load_more').removeClass('loading');
+ $('#bigMarkAsRead').removeAttr('disabled');
load_more = false;
$(document.body).trigger('sticky_kit:recalc');
});