From 4389ccc057e7eb53e93a1f7bef82d55ddf714ad4 Mon Sep 17 00:00:00 2001 From: Vaishali Agola Date: Tue, 29 Dec 2020 18:18:28 +0530 Subject: [PATCH 1/2] Remove redundant DOM queries --- app/assets/js/rtMedia.backbone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/js/rtMedia.backbone.js b/app/assets/js/rtMedia.backbone.js index 49aca377a..740691edb 100755 --- a/app/assets/js/rtMedia.backbone.js +++ b/app/assets/js/rtMedia.backbone.js @@ -2944,6 +2944,6 @@ function rtmedia_disable_popup_navigation( $selector ){ */ const rtMediaScrollComments = () => { const commentBox = document.getElementById( 'rtmedia_comment_ul' ); - const commentsToScroll = ( document.getElementById('rtmedia_comment_ul' ).offsetHeight ) * 1000; + const commentsToScroll = ( commentBox.offsetHeight ) * 1000; commentBox.scrollTo( { top: commentsToScroll, behavior: 'smooth' } ); } From 26ef5943ec7d2e52dd5c9b1562245e177c77f3ff Mon Sep 17 00:00:00 2001 From: Vaishali Agola Date: Tue, 29 Dec 2020 18:27:47 +0530 Subject: [PATCH 2/2] Add null checking for commentBox --- app/assets/js/rtMedia.backbone.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/js/rtMedia.backbone.js b/app/assets/js/rtMedia.backbone.js index 740691edb..0a8c25281 100755 --- a/app/assets/js/rtMedia.backbone.js +++ b/app/assets/js/rtMedia.backbone.js @@ -2944,6 +2944,9 @@ function rtmedia_disable_popup_navigation( $selector ){ */ const rtMediaScrollComments = () => { const commentBox = document.getElementById( 'rtmedia_comment_ul' ); - const commentsToScroll = ( commentBox.offsetHeight ) * 1000; - commentBox.scrollTo( { top: commentsToScroll, behavior: 'smooth' } ); + + if ( commentBox !== null ) { + const commentsToScroll = ( commentBox.offsetHeight ) * 1000; + commentBox.scrollTo( { top: commentsToScroll, behavior: 'smooth' } ); + } }