From 7ea37a1790aa74c0162bb43d5aafad695f99f8a7 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sun, 19 Apr 2015 09:17:29 +0100 Subject: [PATCH] remove unnecessary javascript actions They do exactly the same as the non javascript version. --- assets/js/all.min.js | 39 +++++++++++++------------- assets/js/event.js | 3 -- assets/js/item.js | 10 ------- controllers/item.php | 7 ----- templates/unread_items.php | 4 +-- tests/integration/minifluxTestCase.php | 6 ++-- 6 files changed, 24 insertions(+), 45 deletions(-) diff --git a/assets/js/all.min.js b/assets/js/all.min.js index 943a5f5..c6bb782 100644 --- a/assets/js/all.min.js +++ b/assets/js/all.min.js @@ -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: -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(;0e.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(f){if("read"!==f.getAttribute("data-item-status")){if(f.getAttribute("data-hide"))d(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(){-1v[d])v[d]= -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")&& -"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; -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 "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&& -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&& -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(); -else if(c())if(a=document.getElementsByTagName("article"),document.getElementById("current-item"))for(var b=0,d=a.length;bd.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"))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 e(a){"mouse"!==m.c&&t.d();a.parentNode.removeChild(a);q--}function n(){-1u[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): +(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&& +"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); +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= +"?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(); +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> +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',$direction == 'desc' ? t('older first') : t('most recent first'), '') ?>
  • - +
    • @@ -28,7 +28,7 @@
    - +
    $menu, 'nb_items' => $nb_items, 'items_per_page' => $items_per_page, 'offset' => $offset, 'order' => $order, 'direction' => $direction)) ?> diff --git a/tests/integration/minifluxTestCase.php b/tests/integration/minifluxTestCase.php index 3e31b4c..056603c 100644 --- a/tests/integration/minifluxTestCase.php +++ b/tests/integration/minifluxTestCase.php @@ -536,13 +536,13 @@ abstract class minifluxTestCase extends PHPUnit_Extensions_Selenium2TestCase 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; } 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; } @@ -659,4 +659,4 @@ abstract class minifluxTestCase extends PHPUnit_Extensions_Selenium2TestCase } } } -?> \ No newline at end of file +?>