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

remove unnecessary javascript actions

Browse Source 
They do exactly the same as the non javascript version.
This commit is contained in:
Mathias Kresin 2015-04-19 09:17:29 +01:00
parent 9f21a2fe91
commit 7ea37a1790
6 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,19 @@
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: var k=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:
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= c.setAttribute("data-feed-error","1");a?a(e):g.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));k.h(b,function(b){b=d.indexOf(b.feed_id);0<=b&&d.splice(b,1);0===c.length&&0===d.length&&(clearInterval(a),g.a())})}},100)}}}(),g=function(){function d(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(f){if("read"!==f.getAttribute("data-item-status")){if(f.getAttribute("data-hide"))d(f); 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"))e(f);
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")}l--}}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<l?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=l||"";var b= 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")}l--}}function e(a){"mouse"!==m.c&&t.d();a.parentNode.removeChild(a);q--}function n(){-1<window.location.href.indexOf("nothing_to_read=1")&&0<l?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=l||"";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="Miniflux ("+l+")";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; 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 ("+l+")";break;case "feed-items":document.title="("+q+") "+pageHeading;break;default:document.title=a?pageHeading+" ("+q+")":pageHeading}}function p(a){var e=c(a),h=new XMLHttpRequest;
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),k=new XMLHttpRequest;k.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")}l++}n()}};k.open("POST","?action=mark-item-unread&id="+b,!0);k.send()}var v=[],t=!1, h.onload=function(){t.b()&&(b(a),n())};h.open("POST","?action=mark-item-read&id="+e,!0);h.send()}function v(f){var b=c(f),h=new XMLHttpRequest;h.onload=function(){if(t.b()){if("unread"!==f.getAttribute("data-item-status")){if(f.getAttribute("data-hide"))e(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")}l++}n()}};h.open("POST","?action=mark-item-unread&id="+b,!0);h.send()}var u=[],r=!1,
l=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{o:p,q:w,p:function(a){var b=c(a),k=new XMLHttpRequest;k.onload=function(){u.b()&&(d(a),"unread"===a.getAttribute("data-item-status")&&l--,n())};k.open("POST","?action=mark-item-removed&id="+b,!0);k.send()},g:function(b){var q=c(b),k="1"===b.getAttribute("data-item-bookmark")? l=function(){var a=document.getElementById("nav-counter");if(a)return counter=parseInt(a.textContent,10)||0}(),q=function(){var a=document.getElementById("page-counter");if(a)return counter=parseInt(a.textContent,10)||0}();return{n:p,p:v,o:function(a){var b=c(a),h=new XMLHttpRequest;h.onload=function(){t.b()&&(e(a),"unread"===a.getAttribute("data-item-status")&&l--,n())};h.open("POST","?action=mark-item-removed&id="+b,!0);h.send()},g:function(b){var w=c(b),h="1"===b.getAttribute("data-item-bookmark")?
"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",k),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="+ "0":"1",d=new XMLHttpRequest;d.onload=function(){var c=document.querySelector("section.page");if(t.b()&&"bookmarks"===c.getAttribute("data-item-page"))e(b),n();else if(b.setAttribute("data-item-bookmark",h),t.b())c=b.querySelector("a.bookmark"),a(c);else if((c=b.querySelector("a.bookmark-icon"))&&c.hasAttribute("data-reverse-title")){var d=c.getAttribute("title");c.setAttribute("title",c.getAttribute("data-reverse-title"));c.setAttribute("data-reverse-title",d)}};d.open("POST","?action=bookmark&id="+
q+"&value="+k,!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"); w+"&value="+h,!0);d.send()},A:function(a){var b=a.getAttribute("data-item-status");"read"===b?v(a):"unread"===b&&p(a)},v:function(a){(a=a.querySelector("a.show"))&&d(a)},s: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=b.getAttribute("data-failure-message")};a=c(a);d.open("POST","?action=download-item&id="+a,!0);d.send()}},n:function(a){var b=new XMLHttpRequest;b.onload=function(){window.location.href=a};b.open("POST","?action=mark-all-read",!0);b.send()},r:function(a){var c=new XMLHttpRequest;c.onload=function(){for(var a=document.getElementsByTagName("article"),c=0,d=a.length;c<d;c++)b(a[c]);l=this.responseText;n()};c.open("POST", c&&(c.innerHTML=a.content);b.innerHTML=b.getAttribute("data-after-message")}else b.innerHTML=b.getAttribute("data-failure-message")};a=c(a);e.open("POST","?action=download-item&id="+a,!0);e.send()}},q:function(a){var c=new XMLHttpRequest;c.onload=function(){for(var a=document.getElementsByTagName("article"),c=0,e=a.length;c<e;c++)b(a[c]);l=this.responseText;n()};c.open("POST","?action=mark-feed-as-read&feed_id="+a,!0);c.send()},B:function(){for(var a=["#current-item h1","#item-content","#listing #current-item h2",
"?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=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]= "#listing #current-item .preview"],b=0;b<a.length;b++){var c=document.querySelector(a[b]);c&&(c.dir=""==c.dir?"rtl":"")}},C:function(){return r},a:function(){if(!document.hidden||!r){var a=new XMLHttpRequest;a.onload=function(){var a=0===u.length,b=!1,c=JSON.parse(this.responseText),e;for(e in c.feeds){var d=c.feeds[e];if(!u.hasOwnProperty(e)||d.time>u[e])u[e]=d.time,"unread"===d.status&&(b=!0)}document.hidden||c.nbUnread===l&&!r?document.hidden&&!a&&b&&(r=!0,document.title="\u21bb "+document.title):
e.time,"unread"===e.status&&(b=!0)}document.hidden||c.nbUnread===l&&!t?document.hidden&&!a&&b&&(t=!0,document.title="\u21bb "+document.title):(t=!1,l=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||"TEXTAREA"===a.tagName?!0:!1}var c=[];return{c:"",l:function(){document.onclick=function(a){a.target.hasAttribute("data-action")&& (r=!1,l=c.nbUnread,n())};a.open("POST","?action=latest-feeds-items",!0);a.send()}}}}(),m=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&&a.preventDefault()};document.onmouseup=function(a){if(2!==a.button)if("INPUT"===a.target.nodeName&&
"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=element;break a}c=void 0}switch(b){case "refresh-all":h.i();break;case "refresh-feed":c&&h.h(c);break; "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=element;break a}c=void 0}switch(b){case "refresh-all":k.i();break;case "refresh-feed":c&&k.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);
case "mark-read":c&&g.o(c);break;case "mark-unread":c&&g.q(c);break;case "mark-removed":c&&g.p(c);break;case "bookmark":c&&g.g(c);break;case "download-item":c&&g.e(c);break;case "mark-all-read":g.n("?action=unread");break;case "mark-feed-read":g.r(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]||103===c[0])switch(c[1]){case void 0:break;case "u":case 117:window.location.href="?action=unread";c=[]; break;case "download-item":c&&g.e(c);break;case "mark-feed-read":g.q(a.target.getAttribute("data-feed-id"))}}}}},k:function(){document.onkeypress=function(a){if(!d(a))if(m.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="?action=bookmarks";c=[];break;case "h":case 104:window.location.href="?action=history";c=[];break;case "s":case 115:window.location.href=
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;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&& "?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;case "p":case 112:case "k":case 107:t.f();break;case "n":case 110:case "j":case 106:t.d();break;case "v":case 118:b&&g.s(b);break;case "o":case 111:b&&g.v(b);break;case "m":case 109:b&&g.A(b);break;case "f":case 102:b&&g.g(b);break;case "h":case 104:t.t();break;case "l":case 108:t.r();
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;case "ArrowRight":case "Right":case 39:u.d()}}},m:function(){document.addEventListener("visibilitychange",function(){!document.hidden&& break;case "r":case 114:k.i();break;case "?":case 63:t.w();break;case "z":case 122:g.B()}}};document.onkeydown=function(a){if(!d(a))switch(m.c="keyboard",a.key||a.which){case "ArrowLeft":case "Left":case 37:t.f();break;case "ArrowRight":case "Right":case 39:t.d()}}},m:function(){document.addEventListener("visibilitychange",function(){!document.hidden&&g.C()&&g.a()})}}}(),t=function(){function d(a){var b=pageYOffset+document.documentElement.clientHeight;(0>b-(a.offsetTop+a.offsetHeight)||b-a.offsetTop>
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.getElementById("previous-page");a&&a.click()},d:function(){var a=document.getElementById("next-item");if(a)a.click(); document.documentElement.clientHeight)&&window.scrollTo(0,a.offsetTop-10)}function c(){return document.getElementById("listing")?!0:!1}return{r:function(){var a=document.getElementById("next-page");a&&a.click()},t: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=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,e=a.length;b<e;b++){if("current-item"===
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=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=a.length-1;0<=b;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"===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=
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}}(); "current-item",d(a[a.length-1])},w:function(){open("?action=show-help","Help","width=320,height=450,location=no,scrollbars=no,status=no,toolbar=no")},b:c}}();({D:function(){},u:function(){m.k();m.l();m.m();this.j()},j:function(){var d=new XMLHttpRequest;d.onload=function(){var c=JSON.parse(this.responseText);0<c.frontend_updatecheck_interval&&(g.a(),setInterval(function(){g.a()},6E4*c.frontend_updatecheck_interval))};d.open("POST","?action=get-config",!0);d.send(JSON.stringify(["frontend_updatecheck_interval"]))}}).u();
({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();

3
assets/js/event.js
View File

@ -84,9 +84,6 @@ Miniflux.Event = (function() {
case 'download-item': case 'download-item':
currentItem && Miniflux.Item.DownloadContent(currentItem); currentItem && Miniflux.Item.DownloadContent(currentItem);
break; break;
case 'mark-all-read':
Miniflux.Item.MarkAllAsRead('?action=unread');
break;
case 'mark-feed-read': case 'mark-feed-read':
Miniflux.Item.MarkFeedAsRead(e.target.getAttribute("data-feed-id")); Miniflux.Item.MarkFeedAsRead(e.target.getAttribute("data-feed-id"));
break; break;

10
assets/js/item.js
View File

@ -298,16 +298,6 @@ Miniflux.Item = (function() {
request.open("POST", "?action=download-item&id=" + item_id, true); request.open("POST", "?action=download-item&id=" + item_id, true);
request.send(); request.send();
}, },
MarkAllAsRead: function(redirect) {
var request = new XMLHttpRequest();
request.onload = function() {
window.location.href = redirect;
};
request.open("POST", "?action=mark-all-read", true);
request.send();
},
MarkFeedAsRead: function(feed_id) { MarkFeedAsRead: function(feed_id) {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();

7
controllers/item.php
View File

@ -165,13 +165,6 @@ Router\get_action('mark-all-read', function() {
Response\redirect('?action=unread'); Response\redirect('?action=unread');
}); });
// Mark all unread items as read (Ajax request)
Router\post_action('mark-all-read', function(){
Model\Item\mark_all_as_read();
Response\json(array('OK'));
});
// 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() {

4
templates/unread_items.php
View File

@ -9,7 +9,7 @@
<a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= tne('sort by date %s(%s)%s', '<span class="hide-mobile">',$direction == 'desc' ? t('older first') : t('most recent first'), '</span>') ?></a> <a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= tne('sort by date %s(%s)%s', '<span class="hide-mobile">',$direction == 'desc' ? t('older first') : t('most recent first'), '</span>') ?></a>
</li> </li>
<li> <li>
<a href="?action=mark-all-read" data-action="mark-all-read"><?= t('mark all as read') ?></a> <a href="?action=mark-all-read"><?= t('mark all as read') ?></a>
</li> </li>
</ul> </ul>
</div> </div>
@ -28,7 +28,7 @@
<?php endforeach ?> <?php endforeach ?>
<div id="bottom-menu"> <div id="bottom-menu">
<a href="?action=mark-all-read" data-action="mark-all-read"><?= t('mark all as read') ?></a> <a href="?action=mark-all-read"><?= t('mark all as read') ?></a>
</div> </div>
<?= \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?> <?= \PicoFarad\Template\load('paging', array('menu' => $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?>

4
tests/integration/minifluxTestCase.php
View File

@ -536,13 +536,13 @@ abstract class minifluxTestCase extends PHPUnit_Extensions_Selenium2TestCase
public function getLinkMarkAllReadHeader() public function getLinkMarkAllReadHeader()
{ {
$link = $this->element($this->using('css selector')->value('div.page-header a[data-action="mark-all-read"]')); $link = $this->element($this->using('css selector')->value('div.page-header a[href|="?action=mark-all-read"]'));
return $link; return $link;
} }
public function getLinkMarkAllReadBottom() public function getLinkMarkAllReadBottom()
{ {
$link = $this->element($this->using('css selector')->value('div#bottom-menu a[data-action="mark-all-read"]')); $link = $this->element($this->using('css selector')->value('div#bottom-menu a[href|="?action=mark-all-read"]'));
return $link; return $link;
} }