mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 03:22:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-81530-main' of https://github.com/HuongNV13/moodle

Browse Source
This commit is contained in:
Shamim Rezaie 2024-05-15 15:12:25 +10:00
commit ee33a59a2a
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calendar/tests/behat/calendar.feature
View File

@ -149,6 +149,25 @@ Feature: Perform basic calendar functionality
Then I should see "Mediocre event"
And ".location-content" "css_element" should not exist
@javascript @editor_tiny
Scenario: Edit a newly created event using TinyMCE editor
Given I log in as "teacher1"
And I follow "Dashboard"
And I click on "New event" "button"
And I set the field "Event title" to "Newly created event"
When I press "Save"
Then I should see "Newly created event"
And I click on "Newly created event" "link"
And I click on "Edit" "button" in the "Newly created event" "dialogue"
And I click on "Show more..." "link"
And I click on the "Link" button for the "Description" TinyMCE editor
And I set the field "Text to display" to "Read more..."
And I set the field "Enter a URL" to "https://moodle.org/"
And I click on "Create link" "button" in the "Create link" "dialogue"
And I press "Save"
And I click on "Newly created event" "link"
And I should see "Read more..."
@javascript
Scenario: Module events editing
Given I log in as "teacher1"

2
lib/editor/tiny/amd/build/editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/editor/tiny/amd/build/editor.min.js.map
View File

File diff suppressed because one or more lines are too long

12
lib/editor/tiny/amd/src/editor.js
View File

@ -121,7 +121,7 @@ export const getInstanceForElementId = elementId => getInstanceForElement(docume
export const getInstanceForElement = element => {
const instance = instanceMap.get(element);
if (instance && instance.removed) {
instanceMap.remove(element);
instanceMap.delete(element);
return undefined;
}
return instance;
@ -133,11 +133,17 @@ export const getInstanceForElement = element => {
* @param {object} config The configuration required to setup the editor
* @param {string} config.elementId The HTML Node ID
* @param {Object} config.options The editor plugin configuration
* @return {Promise<TinyMCE>} The TinyMCE instance
*/
export const setupForElementId = ({elementId, options}) => {
const target = document.getElementById(elementId);
return setupForTarget(target, options);
// We will need to wrap the setupForTarget and editor.remove() calls in a setTimeout.
// Because other events callbacks will still try to run on the removed instance.
// This will cause an error on Firefox.
// We need to make TinyMCE to remove itself outside the event loop.
// @see https://github.com/tinymce/tinymce/issues/3129 for more details.
setTimeout(() => {
return setupForTarget(target, options);
}, 1);
};
/**