Merge pull request #1746 from rtCamp/develop

Version update v4.6.7

README.md

@@ -96,7 +96,7 @@ rtMedia has 3 premium solutions to take care of audio/video conversion.
 
 #### Important Links ####
 
-* [Project Homepage](https://rtmedio.io/?utm_source####readme&utm_medium####plugin&utm_campaign####buddypress-media "Visit rtMedia's Project Homepage")
+* [Project Homepage](https://rtmedia.io/?utm_source####readme&utm_medium####plugin&utm_campaign####buddypress-media "Visit rtMedia's Project Homepage")
 * [Roadmap](https://rtmedia.io/roadmap/?utm_source####readme&utm_medium####plugin&utm_campaign####buddypress-media "Visit rtMedia's Roadmap page")
 * [Documentation](https://rtmedia.io/docs/?utm_source####readme&utm_medium####plugin&utm_campaign####buddypress-media "Visit rtMedia's Documentation page")
 * [FAQ](https://rtmedia.io/faq/?utm_source####readme&utm_medium####plugin&utm_campaign####buddypress-media "Visit rtMedia's FAQ page")
@@ -147,6 +147,19 @@ https://www.youtube.com/watch?v=dJrykKQGDcs
 
 ## Changelog ##
 
+### 4.6.7 [September 16, 2021] ###
+
+* Enhancement
+    * Provided media attachment for all levels in activity comment reply
+    * Compatible with WordPress v5.8.1
+
+* FIXED
+
+    * Removed default download button for video player
+    * Blank activity generation on uploading unsupported media
+    * Broken links of themes under rtMedia settings
+    * PHP Warnings & Notices
+
 ### 4.6.6 [December 30, 2020] ###
 
 * Enhancement

app/admin/RTMediaAdmin.php

@@ -242,7 +242,7 @@ public function rtm_admin_templates() {
 				 *
 				 * @param True to hide the option and false to show the option.
 				 */
-				$display = apply_filters( 'rtmedia_disable_media_in_commented_media', true );
+				$display = apply_filters( 'rtmedia_disable_media_in_commented_media', false );
 				if ( $display ) {
 					?>
 					<style type="text/css">
@@ -939,13 +939,6 @@ public function ui( $hook ) {
 					)
 				);
 
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_on_label', __( 'ON', 'buddypress-media' ) );
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_off_label', __( 'OFF', 'buddypress-media' ) );
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_admin_ajax', $admin_ajax );
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_admin_url', admin_url() );
-				/* path for file upload using ajax */
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_fileupload_url', RTMEDIA_URL . 'app/helper/rtUploadAttachment.php' );
-
 				$rtmedia_admin_strings = array(
 					'no_refresh'                    => esc_html__( 'Please do not refresh this page.', 'buddypress-media' ),
 					'something_went_wrong'          => esc_html__( 'Something went wrong. Please ', 'buddypress-media' ) . '<a href onclick="location.reload();">' . esc_html__( 'refresh', 'buddypress-media' ) . '</a>' . esc_html__( ' page.', 'buddypress-media' ),
@@ -964,9 +957,20 @@ public function ui( $hook ) {
 					'wrong_css_input'               => esc_html__( 'You can not use @import statement in custom css', 'buddypress-media' ),
 				);
 
-				wp_localize_script( 'rtmedia-admin', 'rtmedia_admin_strings', $rtmedia_admin_strings );
-				wp_localize_script( 'rtmedia-admin', 'settings_url', esc_url( add_query_arg( array( 'page' => 'rtmedia-settings' ), ( is_multisite() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) ) ) . '#privacy_enabled' );
-				wp_localize_script( 'rtmedia-admin', 'settings_rt_album_import_url', esc_url( add_query_arg( array( 'page' => 'rtmedia-settings' ), ( is_multisite() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) ) ) );
+				wp_localize_script(
+					'rtmedia-admin',
+					'rtmedia_admin',
+					array(
+						'rtmedia_on_label'             => __( 'ON', 'buddypress-media' ),
+						'rtmedia_off_label'            => __( 'OFF', 'buddypress-media' ),
+						'rtmedia_admin_ajax'           => $admin_ajax,
+						'rtmedia_admin_url'            => admin_url(),
+						'rtmedia_fileupload_url'       => RTMEDIA_URL . 'app/helper/rtUploadAttachment.php', /* path for file upload using ajax */
+						'settings_url'                 => esc_url( add_query_arg( array( 'page' => 'rtmedia-settings' ), ( is_multisite() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) ) ) . '#privacy_enabled',
+						'settings_rt_album_import_url' => esc_url( add_query_arg( array( 'page' => 'rtmedia-settings' ), ( is_multisite() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) ) ) ),
+						'rtmedia_admin_strings'        => $rtmedia_admin_strings,
+					)
+				);
 
 				$rtmedia_admin_support_strings = array(
 					'wp_admin_username_error' => esc_html__( 'Please enter WP Admin Login.', 'buddypress-media' ),

app/assets/admin/js/settings.js

@@ -11,6 +11,13 @@ rtMediaAdmin.templates = {
 
 jQuery( document ).ready( function ( $ ) {
 
+	// Need to pass the object[key] as global variable.
+	if ( 'object' === typeof rtmedia_admin ) {
+		for ( var key in rtmedia_admin ) {
+			window[key] = rtmedia_admin[key];
+		}
+	}
+
 	var bp_media_settings_box = $( '#bp-media-settings-boxes' );
 	var bp_media_metabox_holder = $( '#bp_media_settings_form .bp-media-metabox-holder' );
 	var rtm_licence = $( '#rtm-licenses' );
@@ -480,7 +487,7 @@ jQuery( document ).ready( function ( $ ) {
 		jQuery( '.bp-album-importer-wizard' ).slideToggle();
 	} );
 
-	jQuery( '#rtprivacyinstall' ).click( function ( e ) {
+	jQuery( '#rtprivacyinstall' ).on( 'click', function ( e ) {
 		e.preventDefault();
 		$progress_parent = jQuery( '#rtprivacyinstaller' );
 		$progress_parent.find( '.rtprivacytype' ).each( function () {
@@ -649,7 +656,7 @@ jQuery( document ).ready( function ( $ ) {
 		window.location = document.URL;
 	}
 
-	jQuery( '#bpmedia-bpalbumimport-cleanup' ).click( function ( e ) {
+	jQuery( '#bpmedia-bpalbumimport-cleanup' ).on( 'click', function ( e ) {
 		e.preventDefault();
 		jQuery.post( ajaxurl, {
 			action: 'rtmedia_rt_album_cleanup',
@@ -834,7 +841,7 @@ jQuery( document ).ready( function ( $ ) {
 		rtmedia_upload_files( event );
 	}
 
-	jQuery( '#rtmedia-submit-request' ).click( function () {
+	jQuery( '#rtmedia-submit-request' ).on( 'click', function () {
 		var flag = true;
 		var name = jQuery( '#name' ).val();
 		var email = jQuery( '#email' ).val();
@@ -1026,7 +1033,7 @@ jQuery( document ).ready( function ( $ ) {
 		});
 	}
 
-	jQuery( '#cancel-request' ).click( function () {
+	jQuery( '#cancel-request' ).on( 'click', function () {
 		return false;
 	} );
 
@@ -1044,11 +1051,11 @@ jQuery( document ).ready( function ( $ ) {
 		}
 
 	} );
-	jQuery( "#rtm-masonry-change-thumbnail-info" ).click( function ( e ) {
+	jQuery( "#rtm-masonry-change-thumbnail-info" ).on( 'click', function ( e ) {
 		jQuery( "html, body" ).animate( { scrollTop: 0 }, '500', 'swing' );
 	} );
 
-	jQuery( '#rtm-export-button' ).click( function () {
+	jQuery( '#rtm-export-button' ).on( 'click', function () {
 		data = {
 			action: "rtmedia_export_settings",
 		};
@@ -1063,11 +1070,11 @@ jQuery( document ).ready( function ( $ ) {
 		} );
 	} );
 
-	jQuery( '#rtm-export-data-button' ).click( function(){
+	jQuery( '#rtm-export-data-button' ).on( 'click', function(){
 		window.location.href = '/wp-admin/tools.php?page=export_personal_data';
 	} );
 
-	jQuery( '#rtm-erase-data-button' ).click(function () {
+	jQuery( '#rtm-erase-data-button' ).on( 'click', function () {
 		window.location.href = '/wp-admin/tools.php?page=remove_personal_data';
 	});
 
@@ -1105,6 +1112,6 @@ function rtmedia_addon_do_not_show() {
 	} );
 }
 
-jQuery( window ).load( function () {
+jQuery( window ).on( 'load', function () {
 	jQuery( '.rtmedia-addon-thickbox' ).trigger( 'click' );
 } );

app/assets/js/admin-upload-terms.js

@@ -22,7 +22,7 @@ jQuery( document ).ready( function ( $ ) {
 
     rtp_terms_option_toggle();
 
-    $( 'input[name^="rtmedia-options[general_enable_upload_terms]"], input[name^="rtmedia-options[activity_enable_upload_terms]"], input[name^="rtmedia-options[general_upload_terms_show_pricacy_message]"]' ).change( function () {
+    $( 'input[name^="rtmedia-options[general_enable_upload_terms]"], input[name^="rtmedia-options[activity_enable_upload_terms]"], input[name^="rtmedia-options[general_upload_terms_show_pricacy_message]"]' ).on( 'change', function () {
         rtp_terms_option_toggle();
     } );
 

app/assets/js/rtMedia.backbone.js

@@ -8,6 +8,41 @@ var rtmedia_load_template_flag = true;
 var rtmedia_add_media_button_post_update = false;
 
 
+jQuery( document ).ready( function () {
+
+	// Need to pass the object[key] as global variable.
+	if ( 'object' === typeof rtmedia_backbone ) {
+		for ( var key in rtmedia_backbone ) {
+			window[key] = rtmedia_backbone[key];
+		}
+	}
+	if ( 'object' === typeof rtMedia_plupload ) {
+		for( var key in rtMedia_plupload ) {
+			window[key] = rtMedia_plupload[key];
+		}
+	}
+	if ( 'object' === typeof rtmedia_template ) {
+		for( var key in rtmedia_template ) {
+			window[key] = rtmedia_template[key];
+		}
+	}
+	if ( 'object' === typeof rtMedia_activity ) {
+		for( var key in rtMedia_activity ) {
+			window[key] = rtMedia_activity[key];
+		}
+	}
+	if ( 'object' === typeof rtmedia_bp ) {
+		for( var key in rtmedia_bp ) {
+			window[key] = rtmedia_bp[key];
+		}
+	}
+	if ( 'object' === typeof rtmedia_main ) {
+		for( var key in rtmedia_main ) {
+			window[key] = rtmedia_main[key];
+		}
+	}
+} );
+
 jQuery( function( $ ) {
 	/**
 	 * Issue 1059 fixed: negative comment count
@@ -1151,6 +1186,18 @@ jQuery( document ).ready( function( $ ) {
 		}
 	} );
 
+	// change color of what's new if content is  
+	let whatsNew = jQuery( '#whats-new' );
+	whatsNew.on( 'keyup', function( e ) {
+		if ( ' ' === whatsNew.val() ) {
+			whatsNew.css( 'color', 'transparent' );
+		} else {
+			let replaceNbsp = whatsNew.val().replace( ' ', '' );
+			whatsNew.val( replaceNbsp );
+			whatsNew.css( 'color', 'inherit' );
+		}
+	} );
+
 	if ( typeof rtMedia_update_plupload_config == 'undefined' ) {
 		return false;
 	}
@@ -1362,25 +1409,23 @@ jQuery( document ).ready( function( $ ) {
 				}
 			} );
 
-			if ( typeof rtmedia_direct_upload_enabled != 'undefined' && rtmedia_direct_upload_enabled == '1' ) {
-
-				/*
-				 * add rtmedia_activity_text_with_attachment condition to filter
-				 * if user want media and activity_text both require
-				 * By: Yahil
-				 */
-				if ( '' === jQuery( '#whats-new' ).val().trim() ) {
-					if ( rtmedia_activity_text_with_attachment == 'disable' ) {
-						if ( 0 === jQuery( '#rtmedia_upload_terms_conditions' ).length ) {
-							$( '#whats-new' ).css( 'color', 'transparent' );
-							$( '#whats-new' ).val( ' ' );
-						}
-					} else {
-						jQuery('#whats-new-form').prepend('<div id="message" class="error bp-ajax-message" style="display: block;"><p> ' + rtmedia_empty_activity_msg + ' </p></div>')
-						jQuery( '#whats-new' ).removeAttr( 'disabled' );
-						return false;
-					}
+			/*
+			 * add rtmedia_activity_text_with_attachment condition to filter
+			 * if user want media and activity_text both require
+			 * By: Yahil
+			 */
+			if ( '' === jQuery( '#whats-new' ).val().trim() ) {
+				if ( rtmedia_activity_text_with_attachment == 'disable' ) {
+					$( '#whats-new' ).css( 'color', 'transparent' );
+					$( '#whats-new' ).val( '&nbsp;' );
+				} else {
+					jQuery('#whats-new-form').prepend('<div id="message" class="error bp-ajax-message" style="display: block;"><p> ' + rtmedia_empty_activity_msg + ' </p></div>')
+					jQuery( '#whats-new' ).removeAttr( 'disabled' );
+					return false;
 				}
+			}
+
+			if ( typeof rtmedia_direct_upload_enabled != 'undefined' && rtmedia_direct_upload_enabled == '1' ) {
 				//Call upload event direct when direct upload is enabled (removed UPLOAD button and its triggered event)
 				var allow_upload = rtMediaHook.call( 'rtmedia_js_upload_file', { src: 'activity' } );
 
@@ -1528,7 +1573,7 @@ jQuery( document ).ready( function( $ ) {
 				if ( 'disable' === rtmedia_activity_text_with_attachment &&  '' === jQuery.trim( jQuery( '#whats-new' ).val() ) ) {
 					let textarea = jQuery( '#whats-new' );
 					textarea.css( 'color', 'transparent' );
-					textarea.val( '&nbsp;' );
+					textarea.val( ' ' );
 				}
 
 				jQuery( '#whats-new-form' ).submit();
@@ -1720,6 +1765,7 @@ jQuery( document ).ready( function( $ ) {
 					}
 					rtmedia_add_media_button_post_update.removeAttr( 'disabled' );
 					// Enabled TextBox color back to normal
+					$( '#whats-new' ).val( '' );
 					$( '#whats-new' ).css( 'color', '' );
 
 				};
@@ -2938,7 +2984,7 @@ function rtmedia_disable_popup_navigation( $selector ){
 	} );
 }
 
-/** 
+/**
  * Function that smooth scrolls to the latest comment in rtMedia.
  *  Created on 23-Nov-2020 by Vipin Kumar Dinkar <vipin.dinkar@rtcamp.com>
  */

app/assets/js/rtMedia.js

@@ -1,6 +1,35 @@
 var rtMagnificPopup;
 var rtm_masonry_container;
 var comment_media = false;
+
+jQuery( document ).ready( function () {
+
+	// Need to pass the object[key] as global variable.
+	if ( 'object' === typeof rtmedia_bp ) {
+		for( var key in rtmedia_bp ) {
+			window[key] = rtmedia_bp[key];
+		}
+	}
+
+	if ( 'object' === typeof rtmedia_main ) {
+		for( var key in rtmedia_main ) {
+			window[key] = rtmedia_main[key];
+		}
+	}
+
+	if ( 'object' === typeof rtmedia_upload_terms ) {
+		for( var key in rtmedia_upload_terms ) {
+			window[key] = rtmedia_upload_terms[key];
+		}
+	}
+
+	if ( 'object' === typeof rtmedia_magnific ) {
+		for( var key in rtmedia_magnific ) {
+			window[key] = rtmedia_magnific[key];
+		}
+	}
+});
+
 function apply_rtMagnificPopup( selector ) {
 	jQuery( 'document' ).ready( function( $ ) {
 		var rt_load_more = '';
@@ -1334,5 +1363,18 @@ jQuery( document ).ready( function () {
 			jQuery( 'body' ).removeClass( 'has-sidebar' );
 		}
 	}
-});
 
+	// remove download option from video.
+	if ( rtmedia_main ) {
+		if ( 'undefined' === rtmedia_main.rtmedia_direct_download_link || ! parseInt( rtmedia_main.rtmedia_direct_download_link ) ) {
+			jQuery( document ).on( 'bp_ajax_request', function ( event ) {
+				setTimeout( function() {
+					jQuery( 'video' ).each( function () {
+						jQuery( this ).attr( 'controlsList', 'nodownload' );
+						jQuery( this ).load();
+					} );
+				}, 200 );
+			} );
+		}
+	}
+});