Merge branch 'MDL-75782-400' of https://github.com/andrewnicols/moodle …

…into MOODLE_400_STABLE
moodle · Sep 29, 2022 · 643d5ec · 643d5ec
2 parents 5ce0f28 + 493ef64
commit 643d5ec
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-debug.js
@@ -267,7 +267,14 @@ M.mod_quiz.autosave = {
 
         Y.log('Found TinyMCE.', 'debug', 'moodle-mod_quiz-autosave');
         this.editor_change_handler = Y.bind(this.editor_changed, this);
-        window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        if (window.tinyMCE.onAddEditor) {
+            window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        } else if (window.tinyMCE.on) {
+            var startSaveTimer = this.start_save_timer_if_necessary.bind(this);
+            window.tinyMCE.on('AddEditor', function(event) {
+                event.editor.on('Change Undo Redo keydown', startSaveTimer);
+            });
+        }
     },
 
     /**

diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave-min.js
diff --git a/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js b/mod/quiz/yui/build/moodle-mod_quiz-autosave/moodle-mod_quiz-autosave.js
@@ -264,7 +264,14 @@ M.mod_quiz.autosave = {
         }
 
         this.editor_change_handler = Y.bind(this.editor_changed, this);
-        window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        if (window.tinyMCE.onAddEditor) {
+            window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        } else if (window.tinyMCE.on) {
+            var startSaveTimer = this.start_save_timer_if_necessary.bind(this);
+            window.tinyMCE.on('AddEditor', function(event) {
+                event.editor.on('Change Undo Redo keydown', startSaveTimer);
+            });
+        }
     },
 
     /**

diff --git a/mod/quiz/yui/src/autosave/js/autosave.js b/mod/quiz/yui/src/autosave/js/autosave.js
@@ -265,7 +265,14 @@ M.mod_quiz.autosave = {
 
         Y.log('Found TinyMCE.', 'debug', 'moodle-mod_quiz-autosave');
         this.editor_change_handler = Y.bind(this.editor_changed, this);
-        window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        if (window.tinyMCE.onAddEditor) {
+            window.tinyMCE.onAddEditor.add(Y.bind(this.init_tinymce_editor, this));
+        } else if (window.tinyMCE.on) {
+            var startSaveTimer = this.start_save_timer_if_necessary.bind(this);
+            window.tinyMCE.on('AddEditor', function(event) {
+                event.editor.on('Change Undo Redo keydown', startSaveTimer);
+            });
+        }
     },
 
     /**