aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-23 09:06:45 +0100
committerGitHub <noreply@github.com>2016-11-23 09:06:45 +0100
commit75a4b3b23fcc183d926eb7cc782762085661b2da (patch)
tree40d543e4cc1e17ad4289ca2224413ad88f1c249c /app/Resources
parent7c6b7a40d10f5868f4550a1fd95de7645de3d8fd (diff)
parent0df2a4b021e581c7661968a23e5c8dd5de5273c5 (diff)
downloadwallabag-75a4b3b23fcc183d926eb7cc782762085661b2da.tar.gz
wallabag-75a4b3b23fcc183d926eb7cc782762085661b2da.tar.zst
wallabag-75a4b3b23fcc183d926eb7cc782762085661b2da.zip
Merge pull request #2640 from wallabag/fix-openoriginal
Fixed entry shortcuts available in list view
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/static/themes/baggy/js/shortcuts/entry.js34
-rw-r--r--app/Resources/static/themes/material/js/shortcuts/entry.js34
2 files changed, 38 insertions, 30 deletions
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
index 22aa0caf..c87408b9 100644
--- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
@@ -1,22 +1,26 @@
1import Mousetrap from 'mousetrap'; 1import Mousetrap from 'mousetrap';
2import $ from 'jquery'; 2import $ from 'jquery';
3 3
4/* Article view */ 4$(document).ready(() => {
5Mousetrap.bind('o', () => { 5 if ($('#article').length > 0) {
6 $('div#article_toolbar ul.links a.original')[0].click(); 6 /* Article view */
7}); 7 Mousetrap.bind('o', () => {
8 $('div#article_toolbar ul.links a.original')[0].click();
9 });
8 10
9/* mark as favorite */ 11 /* mark as favorite */
10Mousetrap.bind('f', () => { 12 Mousetrap.bind('f', () => {
11 $('div#article_toolbar ul.links a.favorite')[0].click(); 13 $('div#article_toolbar ul.links a.favorite')[0].click();
12}); 14 });
13 15
14/* mark as read */ 16 /* mark as read */
15Mousetrap.bind('a', () => { 17 Mousetrap.bind('a', () => {
16 $('div#article_toolbar ul.links a.markasread')[0].click(); 18 $('div#article_toolbar ul.links a.markasread')[0].click();
17}); 19 });
18 20
19/* delete */ 21 /* delete */
20Mousetrap.bind('del', () => { 22 Mousetrap.bind('del', () => {
21 $('div#article_toolbar ul.links a.delete')[0].click(); 23 $('div#article_toolbar ul.links a.delete')[0].click();
24 });
25 }
22}); 26});
diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js
index 2dcc93d7..e19800bd 100644
--- a/app/Resources/static/themes/material/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/material/js/shortcuts/entry.js
@@ -1,22 +1,26 @@
1import Mousetrap from 'mousetrap'; 1import Mousetrap from 'mousetrap';
2import $ from 'jquery'; 2import $ from 'jquery';
3 3
4/* open original article */ 4$(document).ready(() => {
5Mousetrap.bind('o', () => { 5 if ($('#article').length > 0) {
6 $('ul.side-nav a.original i')[0].click(); 6 /* open original article */
7}); 7 Mousetrap.bind('o', () => {
8 $('ul.side-nav a.original i')[0].click();
9 });
8 10
9/* mark as favorite */ 11 /* mark as favorite */
10Mousetrap.bind('f', () => { 12 Mousetrap.bind('f', () => {
11 $('ul.side-nav a.favorite i')[0].click(); 13 $('ul.side-nav a.favorite i')[0].click();
12}); 14 });
13 15
14/* mark as read */ 16 /* mark as read */
15Mousetrap.bind('a', () => { 17 Mousetrap.bind('a', () => {
16 $('ul.side-nav a.markasread i')[0].click(); 18 $('ul.side-nav a.markasread i')[0].click();
17}); 19 });
18 20
19/* delete */ 21 /* delete */
20Mousetrap.bind('del', () => { 22 Mousetrap.bind('del', () => {
21 $('ul.side-nav a.delete i')[0].click(); 23 $('ul.side-nav a.delete i')[0].click();
24 });
25 }
22}); 26});