Hide suggestions if the blogroll is empty

akirk · Apr 29, 2022 · 41cd6f6 · 41cd6f6
1 parent fb12d9c
commit 41cd6f6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git a/friends-admin.js b/friends-admin.js
@@ -231,14 +231,13 @@ jQuery( function( $ ) {
 
 		searchTimeout = setTimeout( function() {
 			wp.ajax.post( 'friends_search_links', {
-				_ajax_nonce: $( 'ul.friend-suggestions' ).data( 'nonce' ),
+				_ajax_nonce: $( 'tr.friend-suggestions' ).data( 'nonce' ),
 				search: search
 			} ).done( function( response ) {
 				if ( response.data ) {
-					$( 'ul.friend-suggestions' ).html( response.data.content );
-					$( 'ul.friend-suggestions' ).closest( 'tr' ).show();
+					$( 'tr.friend-suggestions' ).show().find( 'td' ).html( response.data.content ).show();
 				} else {
-					$( 'ul.friend-suggestions' ).closest( 'tr' ).hide();
+					$( 'tr.friend-suggestions' ).hide();
 				}
 			} );
 		}, 50 );

diff --git a/includes/class-admin.php b/includes/class-admin.php
@@ -859,8 +859,7 @@ public function ajax_search_links() {
 			'admin/links',
 			null,
 			array(
-				'skip_ul' => true,
-				'links'   => $links,
+				'links' => $links,
 			)
 		);
 		$content = ob_get_contents();

diff --git a/templates/admin/add-friend.php b/templates/admin/add-friend.php
@@ -7,6 +7,12 @@
  */
 
 $quick_subscribe = _x( 'Quick Subscribe', 'button', 'friends' );
+$links = get_bookmarks(
+	array(
+		'orderby' => 'updated',
+		'limit'   => 15,
+	)
+);
 
 ?><div class="wrap"><form method="post">
 	<?php wp_nonce_field( 'add-friend' ); ?>
@@ -30,23 +36,13 @@
 					</p>
 				</td>
 			</tr>
+			<tr class="friend-suggestions" data-nonce="<?php echo esc_attr( wp_create_nonce( 'friends-links' ) ); ?>" style="display: <?php echo empty( $links ) ? 'none' : 'table-row'; ?>">
 				<th scope="row"><?php esc_html_e( 'Suggestions', 'friends' ); ?></label></th>
 				<td>
 					<?php
-
-					Friends\Friends::template_loader()->get_template_part(
-						'admin/links',
-						null,
-						array(
-							'links' => get_bookmarks(
-								array(
-									'orderby' => 'updated',
-									'limit'   => 15,
-								)
-							),
-						)
-					);
-
+					if ( ! empty( $links ) ) {
+						Friends\Friends::template_loader()->get_template_part( 'admin/links', null, array( 'links' => $links ) );
+					}
 					?>
 					<p class="description" id="friend-suggestions">
 

diff --git a/templates/admin/links.php b/templates/admin/links.php
@@ -6,10 +6,9 @@
  * @package Friends
  */
 
-if ( ! isset( $args['skip_ul'] ) ) {
-	?><ul class="friend-suggestions" data-nonce="<?php echo esc_attr( wp_create_nonce( 'friends-links' ) ); ?>">
-	<?php
-}
+?>
+<ul class="friend-suggestions"">
+<?php
 
 if ( empty( $args['links'] ) ) {
 	?>
@@ -29,8 +28,6 @@
 	</li>
 	<?php
 }
-if ( ! isset( $args['skip_ul'] ) ) {
-	?>
+
+?>
 </ul>
-	<?php
-}