Merge branch 'MDL-68639-master' of https://github.com/xcaro/moodle

moodle · Aug 19, 2021 · 517fe29 · 517fe29
2 parents 84077e5 + 7bcd587
commit 517fe29
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 1 deletion.
diff --git a/...tto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js b/...tto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js
@@ -71,6 +71,9 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         // Run the indent command.
         document.execCommand('indent', false, null);
 
+        // Fix indent list item.
+        this.fixupListItemsAfterIndent();
+
         // Get all blockquotes, both existing and new.
         blockquotes = this.editor.all('blockquote');
 
@@ -195,6 +198,28 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             indent.replace(clone);
             indent = editor.one('.editor-indent');
         }
+    },
+    /**
+     * Fixup for list item after indent.
+     *
+     * @method fixupListItemsAfterIndent
+     */
+    fixupListItemsAfterIndent: function() {
+        var selection = window.rangy.getSelection(),
+            rootelement = this.editor.getDOMNode(),
+            listelement = selection.anchorNode.parentElement;
+
+        listelement = listelement.closest('ol, ul');
+        if (!(listelement && rootelement.contains(listelement))) {
+            return;
+        }
+
+        // We will move the child list into previous list item of the parent.
+        var previous = listelement.previousElementSibling;
+        if (previous && previous.tagName === 'LI') {
+            previous.appendChild(listelement);
+            selection.collapseToEnd();
+        }
     }
 });
 

diff --git a/.../atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js b/.../atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js
diff --git a/...itor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js b/...itor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js
@@ -71,6 +71,9 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         // Run the indent command.
         document.execCommand('indent', false, null);
 
+        // Fix indent list item.
+        this.fixupListItemsAfterIndent();
+
         // Get all blockquotes, both existing and new.
         blockquotes = this.editor.all('blockquote');
 
@@ -195,6 +198,28 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             indent.replace(clone);
             indent = editor.one('.editor-indent');
         }
+    },
+    /**
+     * Fixup for list item after indent.
+     *
+     * @method fixupListItemsAfterIndent
+     */
+    fixupListItemsAfterIndent: function() {
+        var selection = window.rangy.getSelection(),
+            rootelement = this.editor.getDOMNode(),
+            listelement = selection.anchorNode.parentElement;
+
+        listelement = listelement.closest('ol, ul');
+        if (!(listelement && rootelement.contains(listelement))) {
+            return;
+        }
+
+        // We will move the child list into previous list item of the parent.
+        var previous = listelement.previousElementSibling;
+        if (previous && previous.tagName === 'LI') {
+            previous.appendChild(listelement);
+            selection.collapseToEnd();
+        }
     }
 });
 

diff --git a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js
@@ -69,6 +69,9 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
         // Run the indent command.
         document.execCommand('indent', false, null);
 
+        // Fix indent list item.
+        this.fixupListItemsAfterIndent();
+
         // Get all blockquotes, both existing and new.
         blockquotes = this.editor.all('blockquote');
 
@@ -193,5 +196,27 @@ Y.namespace('M.atto_indent').Button = Y.Base.create('button', Y.M.editor_atto.Ed
             indent.replace(clone);
             indent = editor.one('.editor-indent');
         }
+    },
+    /**
+     * Fixup for list item after indent.
+     *
+     * @method fixupListItemsAfterIndent
+     */
+    fixupListItemsAfterIndent: function() {
+        var selection = window.rangy.getSelection(),
+            rootelement = this.editor.getDOMNode(),
+            listelement = selection.anchorNode.parentElement;
+
+        listelement = listelement.closest('ol, ul');
+        if (!(listelement && rootelement.contains(listelement))) {
+            return;
+        }
+
+        // We will move the child list into previous list item of the parent.
+        var previous = listelement.previousElementSibling;
+        if (previous && previous.tagName === 'LI') {
+            previous.appendChild(listelement);
+            selection.collapseToEnd();
+        }
     }
 });