Merge pull request #9 from meyercr/9949bd154e9d01b50132e387059ef987c6887c8b

Here are my patches which fix 2 bugs, and remove some dead code, and deprecated usage.

diff --git a/help/3.php b/help/3.php
index 7e2f1deefb56eb63ff1123b6d0559c73bdb6bed1..45143dcef7f05baf977f80dc61f0fb1f82b54fb7 100644 (file)
--- a/help/3.php
+++ b/help/3.php
@@ -22,6 +22,7 @@
                <tr><td class='n'>o</td><td><?php echo __("Open article in new window") ?></td></tr>
                <tr><td class='n'>c n/c p</td><td><?php echo __("Mark articles below/above active one as read") ?></td></tr>
                <tr><td class='n'>N/P</td><td><?php echo __("Scroll article content") ?></td></tr>
+               <tr><td class='n'>e</td><td><?php echo __("Email article") ?></td></tr>
 
        </table>
 

diff --git a/tt-rss.js b/tt-rss.js
index 1d8d3add8a7e6dc57171f1d9d94cd12766bff49c..d613b7d49670f333139cef1ab2e8a424f56b244f 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -680,6 +680,11 @@ function hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
+                       if (keycode == 69) { // e
+                               var id = getActiveArticleId();
+                               emailArticle(id);
+                       }
+
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});