Merge pull request #4403 from buddyboss/PROD-7208

PROD-7208 - GIFS search is not working on multi-level comments
buddyboss · May 30, 2024 · 6c451be · 6c451be
2 parents 5012d3f + 2af6a59
commit 6c451be
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/src/bp-templates/bp-nouveau/js/buddypress-activity.js b/src/bp-templates/bp-nouveau/js/buddypress-activity.js
@@ -141,7 +141,9 @@ window.bp = window.bp || {};
 					if (
 						$( '#activity-modal:visible' ).length > 0 &&
 						0 === $( '#bp-nouveau-activity-form-placeholder:visible' ).length &&
-						! $( event.target ).closest( '#activity-modal' ).length
+						! $( event.target ).closest( '#activity-modal' ).length &&
+						! $( event.target ).closest( '.gif-media-search-dropdown-standalone' ).length &&
+						! $( event.target ).closest( '.emojionearea-theatre' ).length
 					) {
 						this.closeActivity( event );
 						this.activitySyncOnModalClose( event, activityId );

diff --git a/src/bp-templates/bp-nouveau/js/buddypress-activity.min.js b/src/bp-templates/bp-nouveau/js/buddypress-activity.min.js
diff --git a/src/bp-templates/bp-nouveau/js/buddypress-media.js b/src/bp-templates/bp-nouveau/js/buddypress-media.js
@@ -2112,6 +2112,9 @@ window.bp = window.bp || {};
 
 			if ( !_.isUndefined( BP_Nouveau.media ) && !_.isUndefined( BP_Nouveau.media.gif_api_key ) &&
 				!$targetEl.closest( '.post-gif' ).length ) {
+				if ( $targetEl.closest( '.gif-media-search-dropdown' ).length ) {
+					return;
+				}
 				target.find( 'form' ).find( '.gif-media-search-dropdown' ).removeClass( 'open' );
 				if ( $( '.gif-media-search-dropdown-standalone.open' ).length > 0 ) {
 					target.find( '.gif-media-search-dropdown-standalone' ).removeClass( 'open' );

diff --git a/src/bp-templates/bp-nouveau/js/buddypress-media.min.js b/src/bp-templates/bp-nouveau/js/buddypress-media.min.js
diff --git a/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js b/src/bp-templates/bp-nouveau/js/buddypress-nouveau.js
@@ -3075,7 +3075,8 @@ window.bp = window.bp || {};
 			if ( ! _.isUndefined( BP_Nouveau.media ) &&
 				! _.isUndefined( BP_Nouveau.media.emoji ) &&
 				! $targetEl.closest( '.post-emoji' ).length &&
-				! $targetEl.is( '.emojioneemoji,.emojibtn' ) ) {
+				! $targetEl.is( '.emojioneemoji,.emojibtn' ) &&
+				! $targetEl.closest( '.emojionearea-theatre' ).length ) {
 				$( '.post-emoji.active, .emojionearea-button.active' ).removeClass( 'active' );
 				if ( $( '.emojionearea-theatre.show' ).length > 0 ) {
 					$( '.emojionearea-theatre' ).removeClass( 'show' ).addClass( 'hide' );

diff --git a/src/bp-templates/bp-nouveau/js/buddypress-nouveau.min.js b/src/bp-templates/bp-nouveau/js/buddypress-nouveau.min.js
diff --git a/src/languages/buddyboss.pot b/src/languages/buddyboss.pot
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: BuddyBoss Platform 2.6.11\n"
 "Report-Msgid-Bugs-To: https://www.buddyboss.com/contact/\n"
-"POT-Creation-Date: 2024-05-30 04:51:40+00:00\n"
+"POT-Creation-Date: 2024-05-30 04:54:20+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"