Commit 3b072f0b authored by Andrew Nicols's avatar Andrew Nicols
Browse files

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

parents bc398c26 240085fd
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -34,10 +34,6 @@ import {get_string as getString} from 'core/str';
import {dispatchEvent} from 'core/event_dispatcher';
let changesMadeString;
getString('changesmadereallygoaway', 'moodle').then(string => {
changesMadeString = string;
return string;
}).catch();
/**
* Prevent user navigate away when upload progress still running.
......@@ -192,8 +188,9 @@ export const notifyFieldValidationFailure = (field, message) => dispatchEvent(
* @returns {CustomEvent}
* @fires uploadStarted
*/
export const notifyUploadStarted = elementId => {
export const notifyUploadStarted = async elementId => {
// Add an additional check for changes made.
changesMadeString = await getString('changesmadereallygoaway', 'moodle');
window.addEventListener('beforeunload', changesMadeCheck);
return dispatchEvent(
......
......@@ -419,6 +419,9 @@ class media_videojs_plugin extends core_media_player_native {
* @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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment