Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring back the collapse button for statuses #470

Merged
merged 2 commits into from
Feb 13, 2025
Merged

Bring back the collapse button for statuses #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1970f17
Fix compact mode label
akirk Feb 13, 2025
3f93cbd
Bring back the collapse button for statuses
akirk Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion friends.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion friends.css.map
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 29 additions & 1 deletion friends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,38 @@
return false;
} );

let openMenu = null;
$document.on( 'click', 'a.friends-dropdown-toggle', function ( e ) {
const $this = $( this );
const dropdown = $this.next( '.menu' );
if ( dropdown.is( ':visible' ) ) {
dropdown.hide();
openMenu = null;
} else {
$( '.menu' ).hide();
dropdown.show();
openMenu = dropdown;
}
e.stopPropagation();
return false;
});
$document.on( 'click', function ( e ) {
if ( e.target.closest( '.friends-dropdown' ) ) {
return true;
}
if ( openMenu ) {
openMenu.hide();
}
} );

$document.on( 'click', 'a.collapse-post, .collapsed.card, .all-collapsed .card:not(.uncollapsed)', function ( e ) {
if ( e.target.closest( '.friends-dropdown' ) ) {
return true;
}

const card = $( this ).closest( 'article' );
let collapsed;
if ( card.closest( 'section.all-collapsed' ).length ) {
if ( card.closest( 'section.all-collapsed' ) ) {
card.toggleClass( 'uncollapsed' );
collapsed = ! card.is( '.uncollapsed' );
} else {
Expand Down
5 changes: 4 additions & 1 deletion friends.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ div {
}

&.active .menu,
.friends-dropdown-toggle:focus+.menu,
.menu:hover {
display: block;
}
Expand Down Expand Up @@ -618,6 +617,10 @@ h2#page-title a.dashicons {
padding-left: 1rem;
}

a.collapse-post {
display: none;
}

&.format-status {
padding-bottom: 0;
margin-bottom: .5em;
Expand Down
4 changes: 2 additions & 2 deletions templates/admin/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@
<label for="frontend-default-view">
<span><?php esc_html_e( 'Default view:', 'friends' ); ?></span>
<select name="frontend_default_view" id="frontend-default-view">
<option value="expanded"<?php selected( $args['frontend_default_view'], 'expanded' ); ?>><?php esc_html_e( 'Expanded', 'friends' ); ?></option>
<option value="collapsed"<?php selected( $args['frontend_default_view'], 'collapsed' ); ?>><?php esc_html_e( 'Collapsed', 'friends' ); ?></option>
<option value="expanded"<?php selected( $args['frontend_default_view'], 'expanded' ); ?>><?php esc_html_e( 'Expanded mode', 'friends' ); ?></option>
<option value="collapsed"<?php selected( $args['frontend_default_view'], 'collapsed' ); ?>><?php esc_html_e( 'Compact mode', 'friends' ); ?></option>
</select>
</label>
</fieldset>
Expand Down
4 changes: 3 additions & 1 deletion templates/frontend/author-header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@
<?php if ( $args['friend_user']->can_refresh_feeds() && apply_filters( 'friends_debug', false ) ) : ?>
<a class="chip" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'user', $args['friend_user']->user_login, self_admin_url( 'admin.php?page=friends-refresh' ) ), 'friends-refresh' ) ); ?>"><?php esc_html_e( 'Refresh', 'friends' ); ?></a>
<?php endif; ?>
<a class="chip toggle-compact" href=""><?php esc_html_e( 'Compact Mode', 'friends' ); ?></a>

<a class="chip toggle-compact" href=""><?php echo esc_html( 'collapsed' === $args['frontend_default_view'] ? __( 'Expanded mode', 'friends' ) : __( 'Compact mode', 'friends' ) ); ?></a>

<?php do_action( 'friends_author_header', $args['friend_user'], $args ); ?>
</div>
2 changes: 1 addition & 1 deletion templates/frontend/main-feed-header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</a>
<?php endforeach; ?>

<a class="chip toggle-compact" href=""><?php esc_html_e( 'Compact Mode', 'friends' ); ?></a>
<a class="chip toggle-compact" href=""><?php echo esc_html( 'collapsed' === $args['frontend_default_view'] ? __( 'Expanded mode', 'friends' ) : __( 'Compact mode', 'friends' ) ); ?></a>

<?php do_action( 'friends_main_feed_header', $args ); ?>
</div>
4 changes: 4 additions & 0 deletions templates/frontend/parts/header-status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,15 @@
</div>
<div class="overflow col-ml-auto">
<div class="friends-dropdown friends-dropdown-right">
<a class="btn btn-link collapse-post" tabindex="0" title="<?php esc_html_e( 'Double or meta/shift/cmd click to toggle all', 'friends' ); ?>">
<i class="dashicons dashicons-fullscreen-exit-alt"></i>
</a>
<a class="btn btn-link friends-dropdown-toggle" tabindex="0">
<i class="dashicons dashicons-menu-alt2"></i>
</a>
<ul class="menu" style="min-width: <?php echo esc_attr( intval( _x( '250', 'dropdown-menu-width', 'friends' ) ) ); ?>px">
<li class="menu-item"><a href="<?php echo esc_url( add_query_arg( 'in_reply_to', get_permalink() ) ); ?>" class="quick-reply" data-url="<?php echo esc_attr( get_permalink() ); ?>"><?php esc_html_e( 'Reply', 'friends' ); ?></a></li>
<li class="menu-item"><a href="<?php echo esc_url( add_query_arg( 'boost', get_permalink() ) ); ?>" class="quick-reply" data-url="<?php echo esc_attr( get_permalink() ); ?>"><?php esc_html_e( 'Boost', 'friends' ); ?></a></li>
<?php
Friends\Friends::template_loader()->get_template_part(
'frontend/parts/header-menu',
Expand Down