Merge branch 'MDL-72776-master' of https://github.com/ferranrecio/moodle

moodle · Nov 23, 2021 · 46e6502 · 46e6502
2 parents eab5f3c + 675f8e2
commit 46e6502
Show file tree

Hide file tree

Showing 11 changed files with 137 additions and 49 deletions.
diff --git a/course/amd/build/actions.min.js b/course/amd/build/actions.min.js
diff --git a/course/amd/build/actions.min.js.map b/course/amd/build/actions.min.js.map
diff --git a/course/amd/src/actions.js b/course/amd/src/actions.js
@@ -201,7 +201,13 @@ define(
          * @returns {Node}
          */
         var addSectionLightbox = function(sectionelement) {
-            var lightbox = M.util.add_lightbox(Y, Y.Node(sectionelement.get(0)));
+            const item = sectionelement.get(0);
+            var lightbox = M.util.add_lightbox(Y, Y.Node(item));
+            if (item.dataset.for == 'section' && item.dataset.id) {
+                courseeditor.dispatch('sectionLock', [item.dataset.id], true);
+                lightbox.setAttribute('data-state', 'section');
+                lightbox.setAttribute('data-state-id', item.dataset.id);
+            }
             lightbox.show();
             return lightbox;
         };
@@ -237,6 +243,14 @@ define(
             if (lightbox) {
                 window.setTimeout(function() {
                     lightbox.hide();
+                    // Unlock state if necessary.
+                    if (lightbox.getAttribute('data-state')) {
+                        courseeditor.dispatch(
+                            `${lightbox.getAttribute('data-state')}Lock`,
+                            [lightbox.getAttribute('data-state-id')],
+                            false
+                        );
+                    }
                 }, delay);
             }
         };
@@ -776,18 +790,13 @@ define(
                     return;
                 }
 
-                // Send the element is locked. Reactive events are only triggered when the state
-                // read only mode is restored. We want to notify the interface the element is
-                // locked so we need to do a quick lock operation before performing the rest
-                // of the mutation.
-                statemanager.setReadOnly(false);
-                cm.locked = true;
-                statemanager.setReadOnly(true);
+                // Send the element is locked.
+                courseeditor.dispatch('cmLock', [cm.id], true);
 
                 // Now we do the real mutation.
                 statemanager.setReadOnly(false);
 
-                // This locked will take effect when the read only is restored.
+                // This unlocked will take effect when the read only is restored.
                 cm.locked = false;
 
                 switch (action) {

diff --git a/course/format/amd/build/local/content/section.min.js.map b/course/format/amd/build/local/content/section.min.js.map
diff --git a/course/format/amd/src/local/content/section.js b/course/format/amd/src/local/content/section.js
@@ -82,12 +82,12 @@ export default class extends DndSection {
     }
 
     /**
-    * Validate if the drop data can be dropped over the component.
-    *
-    * @param {Object} dropdata the exported drop data.
-    * @returns {boolean}
-    */
-   validateDropData(dropdata) {
+     * Validate if the drop data can be dropped over the component.
+     *
+     * @param {Object} dropdata the exported drop data.
+     * @returns {boolean}
+     */
+    validateDropData(dropdata) {
         // If the format uses one section per page sections dropping in the content is ignored.
        if (dropdata?.type === 'section' && this.reactive.sectionReturn != 0) {
             return false;