@@ -1154,6 +1154,9 @@ jQuery( document ).ready( function( $ ) {
11541154 objUploadView . uploader . bind ( 'FilesAdded' , function ( upl , rfiles ) {
11551155 //$("#aw-whats-new-submit").attr('disabled', 'disabled');
11561156
1157+ //Remove focusout when media is added in activity post.
1158+ jQuery ( '#whats-new-form' ) . unbind ( 'focusout' ) ;
1159+
11571160 $ . each ( rfiles , function ( i , file ) {
11581161
11591162 //Set file title along with file
@@ -1931,7 +1934,13 @@ function rtmedia_selected_file_list( plupload, file, uploader, error, comment_me
19311934 rtmedia_plupload_file += '</li>' ;
19321935
19331936 jQuery ( rtmedia_plupload_file ) . appendTo ( rtmedia_uploader_filelist ) ;
1934- jQuery ( '#whats-new' ) . focus ( ) ;
1937+
1938+ if ( comment_media_id ) {
1939+ jQuery ( '#rtmedia-comment-media-upload-' + comment_media_id ) . focus ( ) ;
1940+ } else {
1941+ jQuery ( '#whats-new' ) . focus ( ) ;
1942+ }
1943+
19351944 var type = file . type ;
19361945 var media_title = file . name ;
19371946 var ext = media_title . substring ( media_title . lastIndexOf ( '.' ) + 1 , media_title . length ) ;
@@ -1963,7 +1972,17 @@ function rtmedia_selected_file_list( plupload, file, uploader, error, comment_me
19631972 } else {
19641973 jQuery . each ( rtmedia_exteansions , function ( key , value ) {
19651974 if ( value . indexOf ( ext ) >= 0 ) {
1966- jQuery ( '<img src="' + rtmedia_media_thumbs [ key ] + '" />' ) . appendTo ( '#file_thumb_' + file . id ) ;
1975+
1976+ var media_thumbnail = '' ;
1977+
1978+ // Below condition is to show docs and files addon thumbnail.
1979+ if ( rtmedia_media_thumbs [ ext ] ) {
1980+ media_thumbnail = rtmedia_media_thumbs [ ext ] ;
1981+ } else {
1982+ media_thumbnail = rtmedia_media_thumbs [ key ] ;
1983+ }
1984+
1985+ jQuery ( '<img />' , { src : media_thumbnail } ) . appendTo ( '#file_thumb_' + file . id ) ;
19671986
19681987 return false ;
19691988 }
@@ -2449,7 +2468,6 @@ function renderUploadercomment_media( widget_id, parent_id_type ) {
24492468 while ( upl . files . length > 1 ) {
24502469 upl . removeFile ( upl . files [ 0 ] ) ;
24512470 }
2452-
24532471 /* remove the last file that has being added to the comment media */
24542472 commentObj [ widget_id ] . upload_remove_array = [ ] ;
24552473 jQuery ( '#rtmedia_uploader_filelist-' + widget_id + ' li.plupload_queue_li' ) . remove ( ) ;
@@ -2592,11 +2610,8 @@ function renderUploadercomment_media( widget_id, parent_id_type ) {
25922610 rtMediaHook . call ( 'rtmedia_js_after_files_added' , [ upl , rfiles ] ) ;
25932611
25942612 if ( 'undefined' != typeof rtmedia_direct_upload_enabled && '1' == rtmedia_direct_upload_enabled ) {
2595- var allow_upload = rtMediaHook . call ( 'rtmedia_js_upload_file' , true ) ;
2596- if ( false == allow_upload ) {
2597- return false ;
2598- }
25992613
2614+ $ ( '.rtmedia-comment-media-submit-' + widget_id ) . focus ( ) ;
26002615 /* when direct upload is enable */
26012616 jQuery ( '.' + rtmedia_comment_media_submit + widget_id ) . trigger ( 'click' ) ;
26022617 }
@@ -2655,7 +2670,7 @@ function renderUploadercomment_media( widget_id, parent_id_type ) {
26552670
26562671 ext = tmp_array [ tmp_array . length - 1 ] ;
26572672 if ( ! ( typeof ( up . settings . upload_size ) != 'undefined' && typeof ( up . settings . upload_size [ ext ] ) != 'undefined' && ( up . settings . upload_size [ ext ] [ 'size' ] < 1 || ( up . settings . upload_size [ ext ] [ 'size' ] * 1024 * 1024 ) >= err . file . size ) ) ) {
2658- rtmedia_selected_file_list ( plupload , err . file , up , err ) ;
2673+ rtmedia_selected_file_list ( plupload , err . file , up , err , widget_id ) ;
26592674 }
26602675 }
26612676 } else {
@@ -2665,7 +2680,6 @@ function renderUploadercomment_media( widget_id, parent_id_type ) {
26652680
26662681 rtmedia_selected_file_list ( plupload , err . file , '' , err , widget_id ) ;
26672682 }
2668-
26692683 jQuery ( '.plupload_delete-' + widget_id ) . on ( 'click' , function ( e ) {
26702684 e . preventDefault ( ) ;
26712685
0 commit comments