Fix bug #28: History original link disappear

mb-0 · May 1, 2013 · 40f20a9 · 40f20a9
1 parent 855d78b
commit 40f20a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/miniflux/assets/js/app.js b/miniflux/assets/js/app.js
@@ -11,7 +11,7 @@
 
         request.onreadystatechange = function() {
 
-            if (request.readyState === 4) {
+            if (request.readyState === 4 && is_listing()) {
 
                 var response = JSON.parse(request.responseText);
 
@@ -180,8 +180,12 @@
 
         if (link) {
 
-            mark_as_read(link.getAttribute("data-item-id"));
-            find_next_item();
+            if (link.getAttribute("data-action") == "mark-read") {
+
+                mark_as_read(link.getAttribute("data-item-id"));
+                find_next_item();
+            }
+
             link.click();
         }
     }

diff --git a/miniflux/templates/app_header.php b/miniflux/templates/app_header.php
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="viewport" content="width=device-width">
         <link rel="icon" type="image/png" href="./assets/img/favicon.png">
         <link rel="shortcut icon" href="favicon.ico">
         <link rel="apple-touch-icon" href="./assets/img/touch-icon-iphone.png">

diff --git a/miniflux/templates/history.php b/miniflux/templates/history.php
@@ -33,7 +33,6 @@
                     rel="noreferrer"
                     target="_blank"
                     data-item-id="<?= urlencode($item['id']) ?>"
-                    data-action="mark-read"
                 >
                     <?= t('original link') ?>
                 </a>