Merge pull request #2236 from rtCamp/develop

Version update v4.7.7

Author: nayemDevs

Gruntfile.js

@@ -12,7 +12,7 @@ module.exports = function (grunt) {
 				tasks: ['shell:postcss']
 			},
 			js: {
-				files: ['app/assets/js/rtMedia.js', 'app/assets/admin/js/scripts.js'],
+				files: ['app/assets/js/rtMedia.js', 'app/assets/admin/js/scripts.js', 'app/assets/admin/js/settings.js'],
 				tasks: ['terser']
 			}
 		},
@@ -60,7 +60,10 @@ module.exports = function (grunt) {
             },
             backend: {
                 files: {
-                    'app/assets/admin/js/admin.min.js': ['app/assets/admin/js/scripts.js']
+                    'app/assets/admin/js/admin.min.js': [
+                        'app/assets/admin/js/scripts.js',
+                        'app/assets/admin/js/settings.js'
+                    ]
                 }
             },
             godam: {

README.md

@@ -151,6 +151,17 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
+### 4.7.7
+
+* FIXED
+  * Fix JS Build process breaking Admin dashboard.
+  * Fix rtMedia compatibility with Hello Elementor theme.
+  * Fix Masonry script issue in rtMedia Gallery in BuddyX theme.
+
+* ENHANCEMENT
+  * Enhanced End to End playwright testing scripts for media validation.
+  * Improved rtMedia Logo visibility on dashboard.
+
 ### 4.7.6
 
 * FIXED

app/admin/RTMediaAdmin.php

@@ -777,13 +777,15 @@ public function ui( $hook ) {
 
 				$admin_ajax = admin_url( 'admin-ajax.php' );
 
+				// Always enqueue tabs.js as it's a dependency for admin scripts (provides rtTab jQuery plugin).
+				wp_enqueue_script( 'rtmedia-admin-tabs', RTMEDIA_URL . 'app/assets/admin/js/vendors/tabs.js', array( 'backbone' ), RTMEDIA_VERSION, true );
+
 				/* Only one JS file should enqueue */
 				if ( '' === $suffix ) {
-					wp_enqueue_script( 'rtmedia-admin-tabs', RTMEDIA_URL . 'app/assets/admin/js/vendors/tabs.js', array( 'backbone' ), RTMEDIA_VERSION, true );
-					wp_enqueue_script( 'rtmedia-admin-scripts', RTMEDIA_URL . 'app/assets/admin/js/scripts.js', array( 'backbone' ), RTMEDIA_VERSION, true );
+					wp_enqueue_script( 'rtmedia-admin-scripts', RTMEDIA_URL . 'app/assets/admin/js/scripts.js', array( 'rtmedia-admin-tabs', 'backbone' ), RTMEDIA_VERSION, true );
 					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/settings.js', array( 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
 				} else {
-					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/admin.min.js', array( 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
+					wp_enqueue_script( 'rtmedia-admin', RTMEDIA_URL . 'app/assets/admin/js/admin.min.js', array( 'rtmedia-admin-tabs', 'backbone', 'wp-util' ), RTMEDIA_VERSION, true );
 				}
 
 				// Enqueue JS file for GoDAM notice show/hide.

app/assets/admin/img/rtmedia-logo.png

@@ -1066,11 +1066,15 @@ jQuery( document ).ready( function ( $ ) {
 						jQuery('.rtm-button-container.top').append( setting_message );
 						setting_message.delay( 3000 ).fadeOut( 100 );
 					}
+					// Return early for import/export settings responses to avoid JSON.parse on already-parsed object.
+					return;
 				}
 
 				if ( typeof data.error === 'undefined' ) {
-
-					data = JSON.parse( data );
+					// Only parse if data is a string (not already parsed by jQuery).
+					if ( typeof data === 'string' ) {
+						data = JSON.parse( data );
+					}
 					if ( data.exceed_size_msg ) {
 						jQuery( '#debuglog' ).val( '' );
 						alert( data.exceed_size_msg );

app/assets/admin/js/admin.min.js

@@ -342,9 +342,9 @@ jQuery("document").ready(function ($) {
           "get_single_activity_content" === get_action ||
           "activity_get_older_updates" === get_action) &&
         "undefined" !== typeof rtmedia_masonry_layout &&
-        "true" === rtmedia_masonry_layout &&
+        rtm_is_true(rtmedia_masonry_layout) &&
         "undefined" !== typeof rtmedia_masonry_layout_activity &&
-        "true" === rtmedia_masonry_layout_activity
+        rtm_is_true(rtmedia_masonry_layout_activity)
       ) {
         setTimeout(function () {
           apply_rtMagnificPopup(
@@ -1066,9 +1066,9 @@ jQuery("document").ready(function ($) {
   // Masonry code for activity
   if (
     typeof rtmedia_masonry_layout != "undefined" &&
-    rtmedia_masonry_layout == "true" &&
+    rtm_is_true(rtmedia_masonry_layout) &&
     typeof rtmedia_masonry_layout_activity != "undefined" &&
-    rtmedia_masonry_layout_activity == "true"
+    rtm_is_true(rtmedia_masonry_layout_activity)
   ) {
     // Arrange media into masonry view
     rtmedia_activity_masonry();
@@ -1083,9 +1083,9 @@ jQuery("document").ready(function ($) {
         "get_single_activity_content" === get_action ||
         "activity_get_older_updates" === get_action) &&
       typeof rtmedia_masonry_layout != "undefined" &&
-      rtmedia_masonry_layout == "true" &&
+      rtm_is_true(rtmedia_masonry_layout) &&
       typeof rtmedia_masonry_layout_activity != "undefined" &&
-      rtmedia_masonry_layout_activity == "true"
+      rtm_is_true(rtmedia_masonry_layout_activity)
     ) {
       rtmedia_activity_masonry();
     }
@@ -1094,7 +1094,7 @@ jQuery("document").ready(function ($) {
   // Masonry code
   if (
     typeof rtmedia_masonry_layout != "undefined" &&
-    rtmedia_masonry_layout == "true" &&
+    rtm_is_true(rtmedia_masonry_layout) &&
     jQuery(".rtmedia-container .rtmedia-list.rtm-no-masonry").length == 0
   ) {
     rtm_masonry_container = jQuery(".rtmedia-container .rtmedia-list");
@@ -1191,7 +1191,7 @@ jQuery("document").ready(function ($) {
 
             if (
               "undefined" !== typeof rtmedia_masonry_layout &&
-              "true" === rtmedia_masonry_layout
+              rtm_is_true(rtmedia_masonry_layout)
             ) {
               rtm_masonry_reload(rtm_masonry_container);
             }
@@ -1232,6 +1232,16 @@ function bp_media_create_element(id) {
   return false;
 }
 
+/**
+ * Check if a value is true (handles both string "true" and boolean true).
+ *
+ * @param {*} value The value to check.
+ * @return {boolean} True if the value is "true" (string) or true (boolean).
+ */
+function rtm_is_true(value) {
+  return "true" === value || true === value;
+}
+
 function rtmedia_version_compare(left, right) {
   if (typeof left + typeof right != "stringstring") {
     return false;
@@ -1270,7 +1280,17 @@ function rtm_is_element_exist(el) {
 function rtm_masonry_reload(el) {
   setTimeout(function () {
     // We make masonry recalculate the element based on their current state.
-    el.masonry("reload");
+    // Check if masonry instance exists and use the appropriate method.
+    var masonryInstance = el.data('masonry');
+    if (masonryInstance) {
+      // Masonry v4.x uses reloadItems() + layout() instead of reload()
+      if (typeof masonryInstance.reload === 'function') {
+        el.masonry("reload");
+      } else if (typeof masonryInstance.reloadItems === 'function') {
+        masonryInstance.reloadItems();
+        masonryInstance.layout();
+      }
+    }
   }, 250);
 }