Merge branch 'MDL-72407-master' of git://github.com/sarjona/moodle

moodle · Oct 5, 2021 · 3868d35 · 3868d35
2 parents b472f96 + 2a3527c
commit 3868d35
Show file tree

Hide file tree

Showing 19 changed files with 108 additions and 1,627 deletions.
diff --git a/filter/mediaplugin/tests/filter_test.php b/filter/mediaplugin/tests/filter_test.php
@@ -36,7 +36,6 @@ function test_filter_mediaplugin_link() {
 
         // We need to enable the media plugins.
         \core\plugininfo\media::set_enabled_plugins('vimeo,youtube,videojs,html5video,html5audio');
-        set_config('useflash', true, 'media_videojs');
 
         $filterplugin = new filter_mediaplugin(null, array());
 
@@ -59,7 +58,6 @@ function test_filter_mediaplugin_link() {
             '<a href="http://youtu.be/JghQgA2HMX8" class="href=css">test file</a>',
             '<a href="http://y2u.be/JghQgA2HMX8" class="href=css">test file</a>',
             '<a class="youtube" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
-            '<a class="_blanktarget" href="http://moodle.org/testfile/test.flv?d=100x100">test flv</a>',
             '<a class="hrefcss" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
             '<a  class="content"     href="http://moodle.org/testfile/test.ogg">test ogg</a>',
             '<a     id="audio"      href="http://moodle.org/testfile/test.mp3">test mp3</a>',

diff --git a/media/player/videojs/amd/build/loader.min.js b/media/player/videojs/amd/build/loader.min.js
diff --git a/media/player/videojs/amd/build/loader.min.js.map b/media/player/videojs/amd/build/loader.min.js.map
diff --git a/media/player/videojs/amd/build/videojs-flash-lazy.min.js b/media/player/videojs/amd/build/videojs-flash-lazy.min.js
diff --git a/media/player/videojs/amd/build/videojs-flash-lazy.min.js.map b/media/player/videojs/amd/build/videojs-flash-lazy.min.js.map
diff --git a/media/player/videojs/amd/src/loader.js b/media/player/videojs/amd/src/loader.js
@@ -24,7 +24,6 @@
  */
 
 import Ajax from 'core/ajax';
-import Config from 'core/config';
 import {eventTypes} from 'core_filters/events';
 import LocalStorage from 'core/localstorage';
 import Notification from 'core/notification';
@@ -88,14 +87,10 @@ const notifyVideoJS = e => {
                 // Add YouTube to the list of modules we require.
                 modulePromises.push(import('media_videojs/Youtube-lazy'));
             }
-            if (config.techOrder && config.techOrder.indexOf('flash') !== -1) {
-                // Add Flash to the list of modules we require.
-                modulePromises.push(import('media_videojs/videojs-flash-lazy'));
-            }
+
             Promise.all([langStrings, ...modulePromises])
             .then(([langJson, videojs]) => {
                 if (firstLoad) {
-                    videojs.options.flash.swf = `${Config.wwwroot}/media/player/videojs/videojs/video-js.swf`;
                     videojs.options.playbackRates = [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2];
                     videojs.options.userActions = {
                         hotkeys: true,