Merge branch 'MDL-74287-311' of https://github.com/paulholden/moodle …

…into MOODLE_311_STABLE
moodle · Jun 30, 2022 · dd4702e · dd4702e
2 parents ad5e6f0 + c8aa905
commit dd4702e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/lib/form/amd/build/events.min.js b/lib/form/amd/build/events.min.js
diff --git a/lib/form/amd/build/events.min.js.map b/lib/form/amd/build/events.min.js.map
diff --git a/lib/form/amd/src/events.js b/lib/form/amd/src/events.js
@@ -25,10 +25,6 @@
 import {get_string as getString} from 'core/str';
 
 let changesMadeString;
-getString('changesmadereallygoaway', 'moodle').then(string => {
-    changesMadeString = string;
-    return string;
-}).catch();
 
 /**
  * Prevent user navigate away when upload progress still running.
@@ -55,8 +51,9 @@ export const types = {
  * @param {String} elementId
  * @returns {CustomEvent<unknown>}
  */
-export const triggerUploadStarted = elementId => {
+export const triggerUploadStarted = async elementId => {
     // Add an additional check for changes made.
+    changesMadeString = await getString('changesmadereallygoaway', 'moodle');
     window.addEventListener('beforeunload', changesMadeCheck);
     const customEvent = new CustomEvent(types.uploadStarted, {
         bubbles: true,

diff --git a/media/player/videojs/classes/plugin.php b/media/player/videojs/classes/plugin.php
@@ -446,6 +446,9 @@ protected function get_regex_youtube() {
      * @param moodle_page $page The page we are going to add requirements to.
      */
     public function setup($page) {
+        if (during_initial_install() || is_major_upgrade_required()) {
+            return;
+        }
 
         // Load dynamic loader. It will scan page for videojs media and load necessary modules.
         // Loader will be loaded on absolutely every page, however the videojs will only be loaded