jan/miniflux-legacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do mark-feed-as-read in javascript without reload

Browse Source 
follow-up to 4809f736dc. Update
integration tests, to ensure that all articles are marked read, instead
of only visible.
This commit is contained in:
Mathias Kresin 2015-03-08 12:56:59 +01:00
parent 065805e485
commit 3a65e5ee64
6 changed files with 4043 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
assets/js/all.min.js vendored
View File

@ -1,20 +1,20 @@
var l=function(){var d=[];return{h:function(c,a){var b=c.querySelector("span.items-count");if(b){var e=c.getAttribute("data-feed-id"),d=c.querySelector("h2:first-of-type");d.className="loading-icon";var p=new XMLHttpRequest;p.onload=function(){d.className="";c.removeAttribute("data-feed-error");var e=c.querySelector(".feed-last-checked");e&&(e.innerHTML=e.getAttribute("data-after-update"));e=JSON.parse(this.responseText);e.result?b.innerHTML=e.items_count.items_unread+"/"+e.items_count.items_total: var h=function(){var e=[];return{h:function(c,a){var b=c.querySelector("span.items-count");if(b){var d=c.getAttribute("data-feed-id"),e=c.querySelector("h2:first-of-type");e.className="loading-icon";var p=new XMLHttpRequest;p.onload=function(){e.className="";c.removeAttribute("data-feed-error");var d=c.querySelector(".feed-last-checked");d&&(d.innerHTML=d.getAttribute("data-after-update"));d=JSON.parse(this.responseText);d.result?b.innerHTML=d.items_count.items_unread+"/"+d.items_count.items_total:
c.setAttribute("data-feed-error","1");a?a(e):h.a()};p.open("POST","?action=refresh-feed&feed_id="+e,!0);p.send()}},i:function(){var c=Array.prototype.slice.call(document.querySelectorAll("article:not([data-feed-disabled])")),a=setInterval(function(){for(;0<c.length&&5>d.length;){var b=c.shift();d.push(parseInt(b.getAttribute("data-feed-id"),10));l.h(b,function(b){b=d.indexOf(b.feed_id);0<=b&&d.splice(b,1);0===c.length&&0===d.length&&(clearInterval(a),h.a())})}},100)}}}(),h=function(){function d(f){var a= c.setAttribute("data-feed-error","1");a?a(d):g.a()};p.open("POST","?action=refresh-feed&feed_id="+d,!0);p.send()}},i:function(){var c=Array.prototype.slice.call(document.querySelectorAll("article:not([data-feed-disabled])")),a=setInterval(function(){for(;0<c.length&&5>e.length;){var b=c.shift();e.push(parseInt(b.getAttribute("data-feed-id"),10));h.h(b,function(b){b=e.indexOf(b.feed_id);0<=b&&e.splice(b,1);0===c.length&&0===e.length&&(clearInterval(a),g.a())})}},100)}}}(),g=function(){function e(f){var a=
document.createEvent("MouseEvents");a.initEvent("mousedown",!0,!0);f.dispatchEvent(a);a=document.createEvent("MouseEvents");a.initEvent("mouseup",!0,!0);f.dispatchEvent(a);f.click()}function c(a){return item_id=a.getAttribute("data-item-id")}function a(a){if(a&&a.hasAttribute("data-reverse-label")){var b=a.innerHTML;a.innerHTML=a.getAttribute("data-reverse-label");a.setAttribute("data-reverse-label",b)}}function b(a){"mouse"!==n.c&&u.d();a.parentNode.removeChild(a);q--}function e(){-1<window.location.href.indexOf("nothing_to_read=1")&& document.createEvent("MouseEvents");a.initEvent("mousedown",!0,!0);f.dispatchEvent(a);a=document.createEvent("MouseEvents");a.initEvent("mouseup",!0,!0);f.dispatchEvent(a);f.click()}function c(a){return item_id=a.getAttribute("data-item-id")}function a(a){if(a&&a.hasAttribute("data-reverse-label")){var b=a.innerHTML;a.innerHTML=a.getAttribute("data-reverse-label");a.setAttribute("data-reverse-label",b)}}function b(f){if("read"!==f.getAttribute("data-item-status")){if(f.getAttribute("data-hide"))d(f);
0<m?window.location.href="?action=unread":0===q&&window.location.reload();var a=document.getElementById("page-counter");a&&(a.textContent=q||"");document.getElementById("nav-counter").textContent=m||"";var b=document.querySelector("div.page-header h2:first-of-type");if(b)pageHeading=b.firstChild.nodeValue;else if(b=document.querySelector("article.item h1:first-of-type")){document.title=b.textContent;return}switch(document.querySelector("section.page").getAttribute("data-item-page")){case "unread":document.title= else{f.setAttribute("data-item-status","read");var b=f.querySelector("a.mark");a(b);(f=f.querySelector("a.mark"))&&f.setAttribute("data-action","mark-unread")}k--}}function d(a){"mouse"!==m.c&&u.d();a.parentNode.removeChild(a);r--}function n(){-1<window.location.href.indexOf("nothing_to_read=1")&&0<k?window.location.href="?action=unread":0===r&&window.location.reload();var a=document.getElementById("page-counter");a&&(a.textContent=r||"");document.getElementById("nav-counter").textContent=k||"";var b=
"Miniflux ("+m+")";break;case "feed-items":document.title="("+q+") "+pageHeading;break;default:document.title=a?pageHeading+" ("+q+")":pageHeading}}function v(f){var g=c(f),k=new XMLHttpRequest;k.onload=function(){if(u.b()){if(f.getAttribute("data-hide"))b(f);else{f.setAttribute("data-item-status","read");var g=f.querySelector("a.mark");a(g);(g=f.querySelector("a.mark"))&&g.setAttribute("data-action","mark-unread")}m--;e()}};k.open("POST","?action=mark-item-read&id="+g,!0);k.send()}function p(f){var g= document.querySelector("div.page-header h2:first-of-type");if(b)pageHeading=b.firstChild.nodeValue;else if(b=document.querySelector("article.item h1:first-of-type")){document.title=b.textContent;return}switch(document.querySelector("section.page").getAttribute("data-item-page")){case "unread":document.title="Miniflux ("+k+")";break;case "feed-items":document.title="("+r+") "+pageHeading;break;default:document.title=a?pageHeading+" ("+r+")":pageHeading}}function p(a){var q=c(a),d=new XMLHttpRequest;
c(f),k=new XMLHttpRequest;k.onload=function(){if(u.b()){if(f.getAttribute("data-hide"))b(f);else{f.setAttribute("data-item-status","unread");var g=f.querySelector("a.mark");a(g);(g=f.querySelector("a.mark"))&&g.setAttribute("data-action","mark-read")}m++;e()}};k.open("POST","?action=mark-item-unread&id="+g,!0);k.send()}var t=[],r=!1,m=function(){var a=document.getElementById("nav-counter");if(a)return counter=parseInt(a.textContent,10)||0}(),q=function(){var a=document.getElementById("page-counter"); d.onload=function(){u.b()&&(b(a),n())};d.open("POST","?action=mark-item-read&id="+q,!0);d.send()}function w(f){var b=c(f),l=new XMLHttpRequest;l.onload=function(){if(u.b()){if("unread"!==f.getAttribute("data-item-status")){if(f.getAttribute("data-hide"))d(f);else{f.setAttribute("data-item-status","unread");var b=f.querySelector("a.mark");a(b);(b=f.querySelector("a.mark"))&&b.setAttribute("data-action","mark-read")}k++}n()}};l.open("POST","?action=mark-item-unread&id="+b,!0);l.send()}var v=[],t=!1,
if(a)return counter=parseInt(a.textContent,10)||0}();return{n:function(a){"read"!==a.getAttribute("data-item-status")&&v(a)},p:p,o:function(a){var g=c(a),k=new XMLHttpRequest;k.onload=function(){u.b()&&(b(a),"unread"===a.getAttribute("data-item-status")&&m--,e())};k.open("POST","?action=mark-item-removed&id="+g,!0);k.send()},g:function(f){var g=c(f),k="1"===f.getAttribute("data-item-bookmark")?"0":"1",d=new XMLHttpRequest;d.onload=function(){var g=document.querySelector("section.page");if(u.b()&& k=function(){var a=document.getElementById("nav-counter");if(a)return counter=parseInt(a.textContent,10)||0}(),r=function(){var a=document.getElementById("page-counter");if(a)return counter=parseInt(a.textContent,10)||0}();return{n:p,p:w,o:function(a){var b=c(a),l=new XMLHttpRequest;l.onload=function(){u.b()&&(d(a),"unread"===a.getAttribute("data-item-status")&&k--,n())};l.open("POST","?action=mark-item-removed&id="+b,!0);l.send()},g:function(b){var q=c(b),l="1"===b.getAttribute("data-item-bookmark")?
"bookmarks"===g.getAttribute("data-item-page"))b(f),e();else if(f.setAttribute("data-item-bookmark",k),u.b())g=f.querySelector("a.bookmark"),a(g);else if((g=f.querySelector("a.bookmark-icon"))&&g.hasAttribute("data-reverse-title")){var c=g.getAttribute("title");g.setAttribute("title",g.getAttribute("data-reverse-title"));g.setAttribute("data-reverse-title",c)}};d.open("POST","?action=bookmark&id="+g+"&value="+k,!0);d.send()},B:function(a){var b=a.getAttribute("data-item-status");"read"===b?p(a):"unread"=== "0":"1",e=new XMLHttpRequest;e.onload=function(){var c=document.querySelector("section.page");if(u.b()&&"bookmarks"===c.getAttribute("data-item-page"))d(b),n();else if(b.setAttribute("data-item-bookmark",l),u.b())c=b.querySelector("a.bookmark"),a(c);else if((c=b.querySelector("a.bookmark-icon"))&&c.hasAttribute("data-reverse-title")){var q=c.getAttribute("title");c.setAttribute("title",c.getAttribute("data-reverse-title"));c.setAttribute("data-reverse-title",q)}};e.open("POST","?action=bookmark&id="+
b&&v(a)},w:function(a){(a=a.querySelector("a.show"))&&d(a)},t:function(a){(a=a.querySelector("a.original"))&&d(a)},e:function(a){var b=document.getElementById("download-item");if(b){b.innerHTML=" "+b.getAttribute("data-before-message");b.className="loading-icon";var e=new XMLHttpRequest;e.onload=function(){var a=JSON.parse(e.responseText);b.className="";if(a.result){var c=document.getElementById("item-content");c&&(c.innerHTML=a.content);b.innerHTML=b.getAttribute("data-after-message")}else b.innerHTML= q+"&value="+l,!0);e.send()},B:function(a){var b=a.getAttribute("data-item-status");"read"===b?w(a):"unread"===b&&p(a)},w:function(a){(a=a.querySelector("a.show"))&&e(a)},t:function(a){(a=a.querySelector("a.original"))&&e(a)},e:function(a){var b=document.getElementById("download-item");if(b){b.innerHTML=" "+b.getAttribute("data-before-message");b.className="loading-icon";var d=new XMLHttpRequest;d.onload=function(){var a=JSON.parse(d.responseText);b.className="";if(a.result){var c=document.getElementById("item-content");
b.getAttribute("data-failure-message")};a=c(a);e.open("POST","?action=download-item&id="+a,!0);e.send()}},r:function(a){for(var b=document.getElementsByTagName("article"),e=[],d=0,m=b.length;d<m;d++)e.push(c(b[d]));b=new XMLHttpRequest;b.onload=function(){window.location.href=a};b.open("POST","?action=mark-items-as-read",!0);b.send(JSON.stringify(e))},q:function(a){var b=new XMLHttpRequest;b.onload=function(){window.location.href="?action=feeds"};b.open("POST","?action=mark-feed-as-read&feed_id="+ c&&(c.innerHTML=a.content);b.innerHTML=b.getAttribute("data-after-message")}else b.innerHTML=b.getAttribute("data-failure-message")};a=c(a);d.open("POST","?action=download-item&id="+a,!0);d.send()}},r:function(a){for(var b=document.getElementsByTagName("article"),d=[],e=0,k=b.length;e<k;e++)d.push(c(b[e]));b=new XMLHttpRequest;b.onload=function(){window.location.href=a};b.open("POST","?action=mark-items-as-read",!0);b.send(JSON.stringify(d))},q:function(a){var c=new XMLHttpRequest;c.onload=function(){for(var a=
a,!0);b.send()},C:function(){for(var a=["#current-item h1","#item-content","#listing #current-item h2","#listing #current-item .preview"],b=0;b<a.length;b++){var e=document.querySelector(a[b]);e&&(e.dir=""==e.dir?"rtl":"")}},D:function(){return r},a:function(){if(!document.hidden||!r){var a=new XMLHttpRequest;a.onload=function(){var a=0===t.length,b=!1,c=JSON.parse(this.responseText),d;for(d in c.feeds){var f=c.feeds[d];if(!t.hasOwnProperty(d)||f.time>t[d])t[d]=f.time,"unread"===f.status&&(b=!0)}document.hidden|| document.getElementsByTagName("article"),c=0,d=a.length;c<d;c++)b(a[c]);k=this.responseText;n()};c.open("POST","?action=mark-feed-as-read&feed_id="+a,!0);c.send()},C:function(){for(var a=["#current-item h1","#item-content","#listing #current-item h2","#listing #current-item .preview"],b=0;b<a.length;b++){var c=document.querySelector(a[b]);c&&(c.dir=""==c.dir?"rtl":"")}},D:function(){return t},a:function(){if(!document.hidden||!t){var a=new XMLHttpRequest;a.onload=function(){var a=0===v.length,b=!1,
c.nbUnread===m&&!r?document.hidden&&!a&&b&&(r=!0,document.title="\u21bb "+document.title):(r=!1,m=c.nbUnread,e())};a.open("POST","?action=latest-feeds-items",!0);a.send()}}}}(),n=function(){function d(a){if(63!==a.keyCode&&63!==a.which&&(a.ctrlKey||a.shiftKey||a.altKey||a.metaKey))return!0;a=a.target||a.srcElement;return"INPUT"===a.tagName||"TEXTAREA"===a.tagName?!0:!1}var c=[];return{c:"",l:function(){document.onclick=function(a){a.target.hasAttribute("data-action")&&"original"!==a.target.className&& c=JSON.parse(this.responseText),d;for(d in c.feeds){var e=c.feeds[d];if(!v.hasOwnProperty(d)||e.time>v[d])v[d]=e.time,"unread"===e.status&&(b=!0)}document.hidden||c.nbUnread===k&&!t?document.hidden&&!a&&b&&(t=!0,document.title="\u21bb "+document.title):(t=!1,k=c.nbUnread,n())};a.open("POST","?action=latest-feeds-items",!0);a.send()}}}}(),m=function(){function e(a){if(63!==a.keyCode&&63!==a.which&&(a.ctrlKey||a.shiftKey||a.altKey||a.metaKey))return!0;a=a.target||a.srcElement;return"INPUT"===a.tagName||
a.preventDefault()};document.onmouseup=function(a){if(2!==a.button)if("INPUT"===a.target.nodeName&&"auto-select"===a.target.className)a.target.select();else{var b=a.target.getAttribute("data-action");if(b){n.c="mouse";var c;a:{for(element=a.target;element&&element.parentNode;)if(element=element.parentNode,element.tagName&&"article"===element.tagName.toLowerCase()){c=element;break a}c=void 0}switch(b){case "refresh-all":l.i();break;case "refresh-feed":c&&l.h(c);break;case "mark-read":c&&h.n(c);break; "TEXTAREA"===a.tagName?!0:!1}var c=[];return{c:"",l:function(){document.onclick=function(a){a.target.hasAttribute("data-action")&&"original"!==a.target.className&&a.preventDefault()};document.onmouseup=function(a){if(2!==a.button)if("INPUT"===a.target.nodeName&&"auto-select"===a.target.className)a.target.select();else{var b=a.target.getAttribute("data-action");if(b){m.c="mouse";var c;a:{for(element=a.target;element&&element.parentNode;)if(element=element.parentNode,element.tagName&&"article"===element.tagName.toLowerCase()){c=
case "mark-unread":c&&h.p(c);break;case "mark-removed":c&&h.o(c);break;case "bookmark":c&&h.g(c);break;case "download-item":c&&h.e(c);break;case "mark-all-read":h.r("?action=unread");break;case "mark-feed-read":h.q(a.target.getAttribute("data-feed-id"))}}}}},k:function(){document.onkeypress=function(a){if(!d(a))if(n.c="keyboard",c.push(a.key||a.which),"g"===c[0]||103===c[0])switch(c[1]){case void 0:break;case "u":case 117:window.location.href="?action=unread";c=[];break;case "b":case 98:window.location.href= element;break a}c=void 0}switch(b){case "refresh-all":h.i();break;case "refresh-feed":c&&h.h(c);break;case "mark-read":c&&g.n(c);break;case "mark-unread":c&&g.p(c);break;case "mark-removed":c&&g.o(c);break;case "bookmark":c&&g.g(c);break;case "download-item":c&&g.e(c);break;case "mark-all-read":g.r("?action=unread");break;case "mark-feed-read":g.q(a.target.getAttribute("data-feed-id"))}}}}},k:function(){document.onkeypress=function(a){if(!e(a))if(m.c="keyboard",c.push(a.key||a.which),"g"===c[0]||
"?action=bookmarks";c=[];break;case "h":case 104:window.location.href="?action=history";c=[];break;case "s":case 115:window.location.href="?action=feeds";c=[];break;case "p":case 112:window.location.href="?action=config";c=[];break;default:c=[]}else{c=[];var b=document.getElementById("current-item");switch(a.key||a.which){case "d":case 100:b&&h.e(b);break;case "p":case 112:case "k":case 107:u.f();break;case "n":case 110:case "j":case 106:u.d();break;case "v":case 118:b&&h.t(b);break;case "o":case 111:b&& 103===c[0])switch(c[1]){case void 0:break;case "u":case 117:window.location.href="?action=unread";c=[];break;case "b":case 98:window.location.href="?action=bookmarks";c=[];break;case "h":case 104:window.location.href="?action=history";c=[];break;case "s":case 115:window.location.href="?action=feeds";c=[];break;case "p":case 112:window.location.href="?action=config";c=[];break;default:c=[]}else{c=[];var b=document.getElementById("current-item");switch(a.key||a.which){case "d":case 100:b&&g.e(b);break;
h.w(b);break;case "m":case 109:b&&h.B(b);break;case "f":case 102:b&&h.g(b);break;case "h":case 104:u.u();break;case "l":case 108:u.s();break;case "r":case 114:l.i();break;case "?":case 63:u.A();break;case "z":case 122:h.C()}}};document.onkeydown=function(a){if(!d(a))switch(n.c="keyboard",a.key||a.which){case "ArrowLeft":case "Left":case 37:u.f();break;case "ArrowRight":case "Right":case 39:u.d()}}},m:function(){document.addEventListener("visibilitychange",function(){!document.hidden&&h.D()&&h.a()})}}}(), case "p":case 112:case "k":case 107:u.f();break;case "n":case 110:case "j":case 106:u.d();break;case "v":case 118:b&&g.t(b);break;case "o":case 111:b&&g.w(b);break;case "m":case 109:b&&g.B(b);break;case "f":case 102:b&&g.g(b);break;case "h":case 104:u.u();break;case "l":case 108:u.s();break;case "r":case 114:h.i();break;case "?":case 63:u.A();break;case "z":case 122:g.C()}}};document.onkeydown=function(a){if(!e(a))switch(m.c="keyboard",a.key||a.which){case "ArrowLeft":case "Left":case 37:u.f();break;
u=function(){function d(a){var b=pageYOffset+document.documentElement.clientHeight;(0>b-(a.offsetTop+a.offsetHeight)||b-a.offsetTop>document.documentElement.clientHeight)&&window.scrollTo(0,a.offsetTop-10)}function c(){return document.getElementById("listing")?!0:!1}return{s:function(){var a=document.getElementById("next-page");a&&a.click()},u:function(){var a=document.getElementById("previous-page");a&&a.click()},d:function(){var a=document.getElementById("next-item");if(a)a.click();else if(c())if(a= case "ArrowRight":case "Right":case 39:u.d()}}},m:function(){document.addEventListener("visibilitychange",function(){!document.hidden&&g.D()&&g.a()})}}}(),u=function(){function e(a){var b=pageYOffset+document.documentElement.clientHeight;(0>b-(a.offsetTop+a.offsetHeight)||b-a.offsetTop>document.documentElement.clientHeight)&&window.scrollTo(0,a.offsetTop-10)}function c(){return document.getElementById("listing")?!0:!1}return{s:function(){var a=document.getElementById("next-page");a&&a.click()},u:function(){var a=
document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,e=a.length;b<e;b++){if("current-item"===a[b].id){b+1<e&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b+1].id="current-item",d(a[b+1]));break}}else a[0].id="current-item",d(a[0])},f:function(){var a=document.getElementById("previous-item");if(a)a.click();else if(c())if(a=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=a.length-1;0<=b;b--){if("current-item"=== document.getElementById("previous-page");a&&a.click()},d:function(){var a=document.getElementById("next-item");if(a)a.click();else if(c())if(a=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,d=a.length;b<d;b++){if("current-item"===a[b].id){b+1<d&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b+1].id="current-item",e(a[b+1]));break}}else a[0].id="current-item",e(a[0])},f:function(){var a=document.getElementById("previous-item");if(a)a.click();else if(c())if(a=
a[b].id){0<=b-1&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b-1].id="current-item",d(a[b-1]));break}}else a[a.length-1].id="current-item",d(a[a.length-1])},A:function(){open("?action=show-help","Help","width=320,height=450,location=no,scrollbars=no,status=no,toolbar=no")},b:c}}(); document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=a.length-1;0<=b;b--){if("current-item"===a[b].id){0<=b-1&&(a[b].id="item-"+a[b].getAttribute("data-item-id"),a[b-1].id="current-item",e(a[b-1]));break}}else a[a.length-1].id="current-item",e(a[a.length-1])},A:function(){open("?action=show-help","Help","width=320,height=450,location=no,scrollbars=no,status=no,toolbar=no")},b:c}}();
({F:function(){},v:function(){n.k();n.l();n.m();this.j()},j:function(){var d=new XMLHttpRequest;d.onload=function(){var c=JSON.parse(this.responseText);0<c.frontend_updatecheck_interval&&(h.a(),setInterval(function(){h.a()},6E4*c.frontend_updatecheck_interval))};d.open("POST","?action=get-config",!0);d.send(JSON.stringify(["frontend_updatecheck_interval"]))}}).v(); ({F:function(){},v:function(){m.k();m.l();m.m();this.j()},j:function(){var e=new XMLHttpRequest;e.onload=function(){var c=JSON.parse(this.responseText);0<c.frontend_updatecheck_interval&&(g.a(),setInterval(function(){g.a()},6E4*c.frontend_updatecheck_interval))};e.open("POST","?action=get-config",!0);e.send(JSON.stringify(["frontend_updatecheck_interval"]))}}).v();

34
assets/js/item.js
View File

@ -66,6 +66,10 @@ Miniflux.Item = (function() {
function showItemAsRead(item) function showItemAsRead(item)
{ {
if (item.getAttribute("data-item-status") === 'read') {
return;
}
if (item.getAttribute("data-hide")) { if (item.getAttribute("data-hide")) {
hideItem(item); hideItem(item);
} }
@ -79,11 +83,14 @@ Miniflux.Item = (function() {
} }
nbUnreadItems--; nbUnreadItems--;
updateCounters();
} }
function showItemAsUnread(item) function showItemAsUnread(item)
{ {
if (item.getAttribute("data-item-status") === 'unread') {
return;
}
if (item.getAttribute("data-hide")) { if (item.getAttribute("data-hide")) {
hideItem(item); hideItem(item);
} }
@ -97,7 +104,6 @@ Miniflux.Item = (function() {
} }
nbUnreadItems++; nbUnreadItems++;
updateCounters();
} }
function hideItem(item) function hideItem(item)
@ -168,7 +174,10 @@ Miniflux.Item = (function() {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.onload = function() { request.onload = function() {
if (Miniflux.Nav.IsListing()) showItemAsRead(item); if (Miniflux.Nav.IsListing()) {
showItemAsRead(item);
updateCounters();
}
}; };
request.open("POST", "?action=mark-item-read&id=" + item_id, true); request.open("POST", "?action=mark-item-read&id=" + item_id, true);
request.send(); request.send();
@ -180,7 +189,10 @@ Miniflux.Item = (function() {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.onload = function() { request.onload = function() {
if (Miniflux.Nav.IsListing()) showItemAsUnread(item); if (Miniflux.Nav.IsListing()) {
showItemAsUnread(item);
updateCounters();
}
}; };
request.open("POST", "?action=mark-item-unread&id=" + item_id, true); request.open("POST", "?action=mark-item-unread&id=" + item_id, true);
request.send(); request.send();
@ -204,10 +216,7 @@ Miniflux.Item = (function() {
} }
return { return {
MarkAsRead: function(item) { MarkAsRead: markAsRead,
var status = item.getAttribute("data-item-status");
if (status !== "read") markAsRead(item);
},
MarkAsUnread: markAsUnread, MarkAsUnread: markAsUnread,
MarkAsRemoved: markAsRemoved, MarkAsRemoved: markAsRemoved,
SwitchBookmark: function(item) { SwitchBookmark: function(item) {
@ -310,7 +319,14 @@ Miniflux.Item = (function() {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.onload = function() { request.onload = function() {
window.location.href = '?action=feeds'; var articles = document.getElementsByTagName("article");
for (var i = 0, ilen = articles.length; i < ilen; i++) {
showItemAsRead(articles[i]);
}
nbUnreadItems = this.responseText;
updateCounters();
}; };
request.open("POST", "?action=mark-feed-as-read&feed_id=" + feed_id, true); request.open("POST", "?action=mark-feed-as-read&feed_id=" + feed_id, true);

16
controllers/item.php
View File

@ -168,15 +168,23 @@ Router\get_action('mark-as-read', function() {
// Mark all unread items as read for a specific feed // Mark all unread items as read for a specific feed
Router\get_action('mark-feed-as-read', function() { Router\get_action('mark-feed-as-read', function() {
Model\Item\mark_feed_as_read(Request\int_param('feed_id')); $feed_id = Request\int_param('feed_id');
Response\redirect('?action=feeds');
Model\Item\mark_feed_as_read($feed_id);
Response\redirect('?action=feed-items&feed_id='.$feed_id);
}); });
// Mark all unread items as read for a specific feed (Ajax request) // Mark all unread items as read for a specific feed (Ajax request) and return
// the number of unread items. It's not possible to get the number of items
// that where marked read from the frontend, since the number of unread items
// on page 2+ is unknown.
Router\post_action('mark-feed-as-read', function() { Router\post_action('mark-feed-as-read', function() {
Model\Item\mark_feed_as_read(Request\int_param('feed_id')); Model\Item\mark_feed_as_read(Request\int_param('feed_id'));
Response\json(array('OK')); $nb_items = Model\Item\count_by_status('unread');
Response\raw($nb_items);
}); });
// Mark sent items id as read (Ajax request) // Mark sent items id as read (Ajax request)

1890
tests/integration/datasets/expected_MarkFeedRead.xml
View File

File diff suppressed because it is too large Load Diff

2070
tests/integration/datasets/fixture_feed1_extra_long.xml Normal file
View File

File diff suppressed because it is too large Load Diff

28
tests/integration/pageFirstFeedTest.php
View File

@ -394,26 +394,50 @@ class pageFirstFeedTest extends minifluxTestCase
public function testMarkFeedReadHeaderLink() public function testMarkFeedReadHeaderLink()
{ {
// load different fixture and reload the page
$backupDataTester = static::$databaseTester;
static::$databaseTester = NULL;
$dataset = $this->getDataSet('fixture_feed1_extra_long', 'fixture_feed2');
$this->getDatabaseTester($dataset)->onSetUp();
static::$databaseTester = $backupDataTester;
$this->refresh();
// start the "real" test
$link = $this->getLinkFeedMarkReadHeader(); $link = $this->getLinkFeedMarkReadHeader();
$link->click(); $link->click();
$read = $this->waitForArticlesMarkRead(); $read = $this->waitForArticlesMarkRead();
$this->assertTrue($read, 'there are still unread articles'); $this->assertTrue($read, 'there are still unread articles');
$this->expectedCounterPage = static::DEFAULT_COUNTER_PAGE; $this->expectedCounterPage = 120;
$this->expectedCounterUnread = 2; $this->expectedCounterUnread = 2;
$this->expectedDataSet = $this->getDataSet('expected_MarkFeedRead', 'fixture_feed2'); $this->expectedDataSet = $this->getDataSet('expected_MarkFeedRead', 'fixture_feed2');
} }
public function testMarkFeedReadBottomLink() public function testMarkFeedReadBottomLink()
{ {
// load different fixture and reload the page
$backupDataTester = static::$databaseTester;
static::$databaseTester = NULL;
$dataset = $this->getDataSet('fixture_feed1_extra_long', 'fixture_feed2');
$this->getDatabaseTester($dataset)->onSetUp();
static::$databaseTester = $backupDataTester;
$this->refresh();
// start the "real" test
$link = $this->getLinkFeedMarkReadBottom(); $link = $this->getLinkFeedMarkReadBottom();
$link->click(); $link->click();
$read = $this->waitForArticlesMarkRead(); $read = $this->waitForArticlesMarkRead();
$this->assertTrue($read, 'there are still unread articles'); $this->assertTrue($read, 'there are still unread articles');
$this->expectedCounterPage = static::DEFAULT_COUNTER_PAGE; $this->expectedCounterPage = 120;
$this->expectedCounterUnread = 2; $this->expectedCounterUnread = 2;
$this->expectedDataSet = $this->getDataSet('expected_MarkFeedRead', 'fixture_feed2'); $this->expectedDataSet = $this->getDataSet('expected_MarkFeedRead', 'fixture_feed2');
} }