diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-19 22:08:29 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-19 22:24:10 +0100 |
commit | 50f35f0db2be9586205e793f315608eec59c9666 (patch) | |
tree | 0f88f3ab6ad32db026494a7104341c45ee997515 /app/Resources/static | |
parent | 9a57653aec85b0f5220436d5cb76545e66c24a11 (diff) | |
download | wallabag-50f35f0db2be9586205e793f315608eec59c9666.tar.gz wallabag-50f35f0db2be9586205e793f315608eec59c9666.tar.zst wallabag-50f35f0db2be9586205e793f315608eec59c9666.zip |
Move icon into the top menu bar
Change the way to select a random entry:
- select all ids from the given user (with filters)
- choose randomly one in php
- find that entry
Diffstat (limited to 'app/Resources/static')
-rwxr-xr-x | app/Resources/static/themes/material/index.js | 4 | ||||
-rw-r--r-- | app/Resources/static/themes/material/js/tools.js | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js index 96310d81..05794597 100755 --- a/app/Resources/static/themes/material/index.js +++ b/app/Resources/static/themes/material/index.js | |||
@@ -8,7 +8,7 @@ import 'materialize-css/dist/js/materialize'; | |||
8 | import '../_global/index'; | 8 | import '../_global/index'; |
9 | 9 | ||
10 | /* Tools */ | 10 | /* Tools */ |
11 | import { initExport, initFilters } from './js/tools'; | 11 | import { initExport, initFilters, initRandom } from './js/tools'; |
12 | 12 | ||
13 | /* Import shortcuts */ | 13 | /* Import shortcuts */ |
14 | import './js/shortcuts/main'; | 14 | import './js/shortcuts/main'; |
@@ -32,8 +32,10 @@ $(document).ready(() => { | |||
32 | format: 'dd/mm/yyyy', | 32 | format: 'dd/mm/yyyy', |
33 | container: 'body', | 33 | container: 'body', |
34 | }); | 34 | }); |
35 | |||
35 | initFilters(); | 36 | initFilters(); |
36 | initExport(); | 37 | initExport(); |
38 | initRandom(); | ||
37 | 39 | ||
38 | const toggleNav = (toShow, toFocus) => { | 40 | const toggleNav = (toShow, toFocus) => { |
39 | $('.nav-panel-actions').hide(100); | 41 | $('.nav-panel-actions').hide(100); |
diff --git a/app/Resources/static/themes/material/js/tools.js b/app/Resources/static/themes/material/js/tools.js index 39398fd8..0b3d3038 100644 --- a/app/Resources/static/themes/material/js/tools.js +++ b/app/Resources/static/themes/material/js/tools.js | |||
@@ -8,6 +8,7 @@ function initFilters() { | |||
8 | $('#clear_form_filters').on('click', () => { | 8 | $('#clear_form_filters').on('click', () => { |
9 | $('#filters input').val(''); | 9 | $('#filters input').val(''); |
10 | $('#filters :checked').removeAttr('checked'); | 10 | $('#filters :checked').removeAttr('checked'); |
11 | |||
11 | return false; | 12 | return false; |
12 | }); | 13 | }); |
13 | } | 14 | } |
@@ -21,4 +22,15 @@ function initExport() { | |||
21 | } | 22 | } |
22 | } | 23 | } |
23 | 24 | ||
24 | export { initExport, initFilters }; | 25 | function initRandom() { |
26 | // no display if export (ie: entries) not available | ||
27 | if ($('div').is('#export')) { | ||
28 | $('#button_random').show(); | ||
29 | } | ||
30 | } | ||
31 | |||
32 | export { | ||
33 | initExport, | ||
34 | initFilters, | ||
35 | initRandom, | ||
36 | }; | ||