Merge pull request #554 from themeum/sazedul-haque

Youtube video end screen and TinyMCE vulnerability fix
themeum · Sep 13, 2023 · 557dcc6 · 557dcc6
2 parents b6faf24 + 0dcc691
commit 557dcc6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/assets/react/front/tutor-front.js b/assets/react/front/tutor-front.js
@@ -194,20 +194,24 @@ jQuery(document).ready(function($) {
 
 				player.on('play', () => {
 					that.played_once = true;
+
+					if (_tutorobject.tutor_pro_url && player.provider === 'youtube') {
+						$('.plyr--youtube.plyr__poster-enabled .plyr__poster').css('opacity', 0);
+					}
 				});
 
 				player.on('ended', function(event) {
 					const video_data = that.video_data();
 					const instance = event.detail.plyr;
 					const data = { is_ended: true };
 					that.sync_time(instance, data);
-					console.log(
-						video_data.autoload_next_course_content,
-						that.played_once,
-					);
 					if (video_data.autoload_next_course_content && that.played_once) {
 						that.autoload_content();
 					}
+
+					if (_tutorobject.tutor_pro_url && player.provider === 'youtube') {
+						$('.plyr--youtube.plyr__poster-enabled .plyr__poster').css('opacity', 1);
+					}
 				});
 			}
 		},

diff --git a/assets/react/v2/qna.js b/assets/react/v2/qna.js
@@ -110,8 +110,8 @@ window.jQuery(document).ready($=>{
         let question_id = button.closest('[data-question_id]').data('question_id');
         let course_id   = button.closest('[data-course_id]').data('course_id');
         let context     = button.closest('[data-context]').data('context');
-        let answer      = '' !== currentEditor ? tinymce.get(currentEditor).getContent({format: 'raw'}) : form.find('textarea').val();
- 
+        let answer      = '' !== currentEditor ? tinymce.get(currentEditor).getContent() : form.find('textarea').val();
+
         let back_url    = $(this).data('back_url');
 
         const btnInnerHtml = button.html().trim();
@@ -173,6 +173,25 @@ window.jQuery(document).ready($=>{
                     // Reinitialize new added question/reply editor.
                     tinymce.execCommand('mceRemoveEditor', false, editor_id);
                     tinymce.execCommand('mceAddEditor', false, editor_id);
+
+                    // Highlight code snippets
+                    $('.tutor-qna-single-question pre').each(function () {
+                        let el = $(this),
+                            fallback = 'javascript',
+                            lang = el.attr('class').trim().replace('language-', '') || fallback,
+                            highlighted = null;
+
+                        if (Prism) {
+                            try {
+                                highlighted = Prism.highlight(el.text(), Prism.languages[lang], lang);
+                            } catch (error) {
+                                highlighted = Prism.highlight(el.text(), Prism.languages[fallback], fallback);
+                            }
+
+                            highlighted ? el.html(highlighted) : null
+                        }
+                    });
+
                 } else {
                     // Clear question & reply textarea.
                     if ($(".tutor-quesanswer-askquestion textarea")) {