Merge branch 'MDL-75244-311' of https://github.com/andrewnicols/moodle …

…into MOODLE_311_STABLE
moodle · Jul 29, 2022 · 5f6923a · 5f6923a
2 parents fc65a2e + a28e929
commit 5f6923a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-debug.js
@@ -205,7 +205,7 @@ M.core_formchangechecker.get_form_dirty_state = function() {
     // Handle TinyMCE editor instances
     // We can't add a listener in the initializer as the editors may not have been created by that point
     // so we do so here instead
-    if (typeof window.tinyMCE !== 'undefined') {
+    if (typeof window.tinyMCE !== 'undefined' && window.tinyMCE.editors) {
         for (editor in window.tinyMCE.editors) {
             if (window.tinyMCE.editors[editor].isDirty()) {
                 return 1;

diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker-min.js
diff --git a/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js b/lib/yui/build/moodle-core-formchangechecker/moodle-core-formchangechecker.js
@@ -205,7 +205,7 @@ M.core_formchangechecker.get_form_dirty_state = function() {
     // Handle TinyMCE editor instances
     // We can't add a listener in the initializer as the editors may not have been created by that point
     // so we do so here instead
-    if (typeof window.tinyMCE !== 'undefined') {
+    if (typeof window.tinyMCE !== 'undefined' && window.tinyMCE.editors) {
         for (editor in window.tinyMCE.editors) {
             if (window.tinyMCE.editors[editor].isDirty()) {
                 return 1;

diff --git a/lib/yui/src/formchangechecker/js/formchangechecker.js b/lib/yui/src/formchangechecker/js/formchangechecker.js
@@ -203,7 +203,7 @@ M.core_formchangechecker.get_form_dirty_state = function() {
     // Handle TinyMCE editor instances
     // We can't add a listener in the initializer as the editors may not have been created by that point
     // so we do so here instead
-    if (typeof window.tinyMCE !== 'undefined') {
+    if (typeof window.tinyMCE !== 'undefined' && window.tinyMCE.editors) {
         for (editor in window.tinyMCE.editors) {
             if (window.tinyMCE.editors[editor].isDirty()) {
                 return 1;