smallbird
/
dreamish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3087 from momijizukamori/inbox-tweaks-canary 

Fix for annoying button flash on initial inbox load
This commit is contained in:
momijizukamori 2023-04-17 19:15:01 -04:00 committed by GitHub
parent 095cadacdb 4bb882c728
commit 90cd4e6d0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/js/jquery.inbox.js
View File

@ -226,3 +226,4 @@ function check_selected() {
}
none_selected();
$(".action_button").removeClass('no-js');

4
htdocs/scss/pages/inbox.scss
View File

@ -149,6 +149,10 @@
display: block;
}
.action_button.no-js {
display: none;
}
.selected_filter {
display: none;
}

14
views/inbox/index.tt
View File

@ -1,7 +1,13 @@
[%- CALL dw.active_resource_group( "foundation" ) -%]
[% dw.need_res( { group => "foundation" }, 'stc/css/pages/inbox.css', 'js/jquery.inbox.js', 'js/jquery.esn.js', 'js/jquery.commentmanage.js', 'js/jquery.ajaxtip.js' ) %]
[%- sections.title = '.title' | ml -%]
[%- sections.head = BLOCK %]
<noscript>
<style type="text/css">
.action_button.no-js {display: inline-block !important;}
</style>
</noscript>
[% END %]
<div class="alert-box secondary">[% ".beta.on" | ml( aopts = "href='$site.root/betafeatures'", user = dw_beta.ljuser_display ) %]</div>
<div id="inbox">
@ -17,9 +23,9 @@
<div class="header searchhighlight" id="action_row">
<div class="checkbox">[% form.checkbox(name = 'check_all', class = 'check_all', value = 'check_all') %]</div>
<div class="actions">
[% form.submit(name = 'mark_read', value = dw.ml('widget.inbox.menu.mark_read.btn'), class = 'action_button button small show_unread', 'data-action' = 'mark_read') %]
[% form.submit(name = 'mark_unread', value = dw.ml('widget.inbox.menu.mark_unread.btn'), class = 'action_button button small show_read', 'data-action' = 'mark_unread') %]
[% form.submit(name = 'delete', value = dw.ml('.menu.delete.btn'), class = 'action_button button small show_read show_unread', 'data-action' = 'delete') %]
[% form.submit(name = 'mark_read', value = dw.ml('widget.inbox.menu.mark_read.btn'), class = 'action_button button small show_unread js_hide', 'data-action' = 'mark_read') %]
[% form.submit(name = 'mark_unread', value = dw.ml('widget.inbox.menu.mark_unread.btn'), class = 'action_button button small show_read js_hide', 'data-action' = 'mark_unread') %]
[% form.submit(name = 'delete', value = dw.ml('.menu.delete.btn'), class = 'action_button button small show_read show_unread js_hide', 'data-action' = 'delete') %]
[% form.submit(name = 'mark_all', value = dw.ml(mark_all), class = 'action_button button small show_all', 'data-action' = 'mark_all') %]
[% form.submit(name = 'delete_all', value = dw.ml(delete_all), class = 'action_button button small show_all', 'data-action' = 'delete_all') %]
</div>