-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1746 from rtCamp/develop
Version update v4.6.7
- Loading branch information
Showing
18 changed files
with
450 additions
and
285 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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( ' ' ); | ||
} 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( ' ' ); | ||
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 <[email protected]> | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.