diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2018-01-12 23:10:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-12 23:10:21 +0100 |
commit | fd637b9a5af28d432f775297ff19ba3f779d55b2 (patch) | |
tree | dc8fc13c8b09019cf0b5ac00f05a0f4a9656e5d0 /app/Resources/static/themes/material/index.js | |
parent | 99e8c2785b9fc0cd9cc8674cb297a13a1035238f (diff) | |
parent | 5614df19cf3ed2be9d56853e5441412d4d09cff4 (diff) | |
download | wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.tar.gz wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.tar.zst wallabag-fd637b9a5af28d432f775297ff19ba3f779d55b2.zip |
Merge pull request #3541 from Simounet/feature/nav-label-replaced-by-buttons
Nav actions updated
Diffstat (limited to 'app/Resources/static/themes/material/index.js')
-rwxr-xr-x | app/Resources/static/themes/material/index.js | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js index 36505d71..96310d81 100755 --- a/app/Resources/static/themes/material/index.js +++ b/app/Resources/static/themes/material/index.js | |||
@@ -35,6 +35,13 @@ $(document).ready(() => { | |||
35 | initFilters(); | 35 | initFilters(); |
36 | initExport(); | 36 | initExport(); |
37 | 37 | ||
38 | const toggleNav = (toShow, toFocus) => { | ||
39 | $('.nav-panel-actions').hide(100); | ||
40 | $(toShow).show(100); | ||
41 | $('.nav-panels').css('background', 'white'); | ||
42 | $(toFocus).focus(); | ||
43 | }; | ||
44 | |||
38 | $('#nav-btn-add-tag').on('click', () => { | 45 | $('#nav-btn-add-tag').on('click', () => { |
39 | $('.nav-panel-add-tag').toggle(100); | 46 | $('.nav-panel-add-tag').toggle(100); |
40 | $('.nav-panel-menu').addClass('hidden'); | 47 | $('.nav-panel-menu').addClass('hidden'); |
@@ -42,34 +49,21 @@ $(document).ready(() => { | |||
42 | return false; | 49 | return false; |
43 | }); | 50 | }); |
44 | $('#nav-btn-add').on('click', () => { | 51 | $('#nav-btn-add').on('click', () => { |
45 | $('.nav-panel-buttom').hide(100); | 52 | toggleNav('.nav-panel-add', '#entry_url'); |
46 | $('.nav-panel-add').show(100); | ||
47 | $('.nav-panels .action').hide(100); | ||
48 | $('.nav-panel-menu').addClass('hidden'); | ||
49 | $('.nav-panels').css('background', 'white'); | ||
50 | $('#entry_url').focus(); | ||
51 | return false; | 53 | return false; |
52 | }); | 54 | }); |
53 | const materialAddForm = $('.nav-panel-add form[name=entry]'); | 55 | const materialAddForm = $('.nav-panel-add'); |
54 | materialAddForm.on('submit', () => { | 56 | materialAddForm.on('submit', () => { |
55 | materialAddForm.addClass('disabled'); | 57 | materialAddForm.addClass('disabled'); |
56 | $('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur'); | 58 | $('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur'); |
57 | }); | 59 | }); |
58 | $('#nav-btn-search').on('click', () => { | 60 | $('#nav-btn-search').on('click', () => { |
59 | $('.nav-panel-buttom').hide(100); | 61 | toggleNav('.nav-panel-search', '#search_entry_term'); |
60 | $('.nav-panel-search').show(100); | ||
61 | $('.nav-panels .action').hide(100); | ||
62 | $('.nav-panel-menu').addClass('hidden'); | ||
63 | $('.nav-panels').css('background', 'white'); | ||
64 | $('#search_entry_term').focus(); | ||
65 | return false; | 62 | return false; |
66 | }); | 63 | }); |
67 | $('.close').on('click', () => { | 64 | $('.close').on('click', (e) => { |
68 | $('.nav-panel-add').hide(100); | 65 | $(e.target).parent('.nav-panel-item').hide(100); |
69 | $('.nav-panel-search').hide(100); | 66 | $('.nav-panel-actions').show(100); |
70 | $('.nav-panel-buttom').show(100); | ||
71 | $('.nav-panels .action').show(100); | ||
72 | $('.nav-panel-menu').removeClass('hidden'); | ||
73 | $('.nav-panels').css('background', 'transparent'); | 67 | $('.nav-panels').css('background', 'transparent'); |
74 | return false; | 68 | return false; |
75 | }); | 69 | }); |