diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
index d9d39e0a505..03f7929765f 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
@@ -206,7 +206,7 @@ M.atto_image = M.atto_image || {
                    '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
                    '<br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
-            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                     M.util.get_string('browserepositories', 'atto_image') +
                     '</button>' +
                     '<br/>';
@@ -235,7 +235,7 @@ M.atto_image = M.atto_image || {
                 '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_image_urlentrysubmit">' +
+                '<button id="atto_image_urlentrysubmit" type="submit">' +
                 M.util.get_string('createimage', 'atto_image') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
index 94dc66a2c5e..5f66365f7af 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s<i.childNodes.length;s++){var u=i.childNodes[0];o.length===0&&(u.nodeName.toLowerCase()==="img"?o[0]=u:u.getElementsByTagName&&(o=u.getElementsByTagName("img")))}if(o.length>0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"));var c=a.get("role");c==="presentation"&&e.one("#atto_image_presentation").set("checked","checked")}r.show()}},r=M.util.image_url("e/insert_edit_image","core");M.editor_atto.add_toolbar_button(t.elementid,"image",r,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},url_changed:function(){var t=e.one("#atto_image_urlentry");if(t.get("value")!==""){var n=new Image;n.onload=function(){var t;t=e.one("#atto_image_widthentry"),t.get("value")===""&&t.set("value",this.width),t=e.one("#atto_image_heightentry"),t.get("value")===""&&t.set("value",this.height),t=e.one("#atto_image_preview"),t.set("src",this.src),t.setStyle("display","inline")},n.src=t.get("value")}},set_image:function(t,n){var r=t.currentTarget.ancestor(".atto_form").one("#atto_image_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry");var s=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_widthentry");var o=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_heightentry");var u=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation");var a=r.get("checked"),f;t.preventDefault();if(s===""&&!a){f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","block"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!0),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!0);return}f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","none"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!1),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!1),M.atto_image.dialogue.hide();if(i!==""){M.editor_atto.set_selection(M.atto_image.selection);var l='<img src="'+e.Escape.html(i)+'" alt="'+e.Escape.html(s)+'"';o&&(l+=' width="'+e.Escape.html(o)+'"'),u&&(l+=' height="'+e.Escape.html(u)+'"'),a&&(l+=' role="presentation"'),l+="/>",document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(l):document.execCommand("insertHTML",!1,l),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>'+"<br/>";M.editor_atto.can_show_filepicker(t,"image")&&(n+='<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<br/>"),n+='<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">'+M.util.get_string("presentationoraltrequired","atto_image")+"</div>"+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>'+"<br/>"+'<input type="checkbox" id="atto_image_presentation"/>'+'<label class="sameline" for="atto_image_presentation">'+M.util.get_string("presentation","atto_image")+"</label>"+"<br/>"+'<label class="sameline" for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label class="sameline" for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+"<br/>"+'<label for="atto_image_preview">'+M.util.get_string("preview","atto_image")+"</label>"+'<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_image_urlentrysubmit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image");var r=e.Node.create(n);return r.one("#atto_image_urlentry").on("blur",M.atto_image.url_changed,this),r.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image,this,t),M.editor_atto.can_show_filepicker(t,"image")&&r.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),
-r}}},"@VERSION@",{requires:["node","escape"]});
+YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s<i.childNodes.length;s++){var u=i.childNodes[0];o.length===0&&(u.nodeName.toLowerCase()==="img"?o[0]=u:u.getElementsByTagName&&(o=u.getElementsByTagName("img")))}if(o.length>0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"));var c=a.get("role");c==="presentation"&&e.one("#atto_image_presentation").set("checked","checked")}r.show()}},r=M.util.image_url("e/insert_edit_image","core");M.editor_atto.add_toolbar_button(t.elementid,"image",r,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},url_changed:function(){var t=e.one("#atto_image_urlentry");if(t.get("value")!==""){var n=new Image;n.onload=function(){var t;t=e.one("#atto_image_widthentry"),t.get("value")===""&&t.set("value",this.width),t=e.one("#atto_image_heightentry"),t.get("value")===""&&t.set("value",this.height),t=e.one("#atto_image_preview"),t.set("src",this.src),t.setStyle("display","inline")},n.src=t.get("value")}},set_image:function(t,n){var r=t.currentTarget.ancestor(".atto_form").one("#atto_image_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry");var s=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_widthentry");var o=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_heightentry");var u=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation");var a=r.get("checked"),f;t.preventDefault();if(s===""&&!a){f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","block"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!0),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!0);return}f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","none"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!1),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!1),M.atto_image.dialogue.hide();if(i!==""){M.editor_atto.set_selection(M.atto_image.selection);var l='<img src="'+e.Escape.html(i)+'" alt="'+e.Escape.html(s)+'"';o&&(l+=' width="'+e.Escape.html(o)+'"'),u&&(l+=' height="'+e.Escape.html(u)+'"'),a&&(l+=' role="presentation"'),l+="/>",document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(l):document.execCommand("insertHTML",!1,l),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>'+"<br/>";M.editor_atto.can_show_filepicker(t,"image")&&(n+='<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'" type="button">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<br/>"),n+='<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">'+M.util.get_string("presentationoraltrequired","atto_image")+"</div>"+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>'+"<br/>"+'<input type="checkbox" id="atto_image_presentation"/>'+'<label class="sameline" for="atto_image_presentation">'+M.util.get_string("presentation","atto_image")+"</label>"+"<br/>"+'<label class="sameline" for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label class="sameline" for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+"<br/>"+'<label for="atto_image_preview">'+M.util.get_string("preview","atto_image")+"</label>"+'<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_image_urlentrysubmit" type="submit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image");var r=e.Node.create(n);return r.one("#atto_image_urlentry").on("blur",M.atto_image.url_changed,this),r.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image,this,t),M.editor_atto.can_show_filepicker(t,"image")&&r.one("#openimagebrowser").on("click",M.
+atto_image.open_filepicker),r}}},"@VERSION@",{requires:["node","escape"]});
diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
index d9d39e0a505..03f7929765f 100644
--- a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
+++ b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
@@ -206,7 +206,7 @@ M.atto_image = M.atto_image || {
                    '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
                    '<br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
-            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                     M.util.get_string('browserepositories', 'atto_image') +
                     '</button>' +
                     '<br/>';
@@ -235,7 +235,7 @@ M.atto_image = M.atto_image || {
                 '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_image_urlentrysubmit">' +
+                '<button id="atto_image_urlentrysubmit" type="submit">' +
                 M.util.get_string('createimage', 'atto_image') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/image/yui/src/button/js/button.js b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
index 66c5c55cb83..0684a094738 100644
--- a/lib/editor/atto/plugins/image/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/image/yui/src/button/js/button.js
@@ -204,7 +204,7 @@ M.atto_image = M.atto_image || {
                    '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
                    '<br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
-            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                     M.util.get_string('browserepositories', 'atto_image') +
                     '</button>' +
                     '<br/>';
@@ -233,7 +233,7 @@ M.atto_image = M.atto_image || {
                 '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_image_urlentrysubmit">' +
+                '<button id="atto_image_urlentrysubmit" type="submit">' +
                 M.util.get_string('createimage', 'atto_image') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
index 253db5a530c..bfc2ef57b83 100644
--- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
+++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
@@ -243,7 +243,7 @@ M.atto_link = M.atto_link || {
                    '</label>' +
                    '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
-            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button" >' +
                     M.util.get_string('browserepositories', 'atto_link') +
                     '</button>' +
                     '<br/>';
@@ -254,7 +254,7 @@ M.atto_link = M.atto_link || {
                 '<br/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_link_urlentrysubmit">' +
+                '<button type="submit" id="atto_link_urlentrysubmit">' +
                 M.util.get_string('createlink', 'atto_link') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
index b2b4af91168..ecc3a513ec2 100644
--- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
+++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,display_chooser:function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}},init:function(e){var t=M.util.image_url("e/insert_edit_link","core");M.editor_atto.add_toolbar_button(e.elementid,"link",t,e.group,this.display_chooser,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r,i;if(!t)return;n=M.atto_link.find_selected_anchors(e.one(t)),n.length>0&&(r=n[0],M.atto_link.selection=M.editor_atto.get_selection_from_node(r),i=r.getAttribute("href"),target=r.getAttribute("target"),i!==""&&e.one("#atto_link_urlentry").set("value",i),target==="_blank"?e.one("#atto_link_openinnewwindow").set("checked","checked"):e.one("#atto_link_openinnewwindow").set("checked",""))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(t,n){var r,i,s,o,u;t.preventDefault(),M.atto_link.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("input[type=url]"),u=r.get("value");if(u!==""){M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,u),s=M.editor_atto.get_selection_parent_node();if(!s)return;o=M.atto_link.find_selected_anchors(e.one(s)),e.Array.each(o,function(e){i=t.currentTarget.ancestor(".atto_form").one("input[type=checkbox]"),i.get("checked")?e.setAttribute("target","_blank"):e.removeAttribute("target")}),M.editor_atto.text_updated(n)}},find_selected_anchors:function(e){var t=e.get("tagName"),n,r;return t&&t.toLowerCase()==="a"?[e]:(r=[],e.all("a").each(function(e){!n&&M.editor_atto.selection_contains_node(e)&&r.push(e)}),r.length>0?r:(n=e.ancestor("a"),n?[n]:[]))},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';M.editor_atto.can_show_filepicker(t,"link")&&(n+='<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<br/>"),n+='<input type="checkbox" id="atto_link_openinnewwindow"/><label class="sameline" for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label>"+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link");var r=e.Node.create(n);return r.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link,this,t),M.editor_atto.can_show_filepicker(t,"link")&&r.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),r}}},"@VERSION@",{requires:["node","escape"]});
+YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,display_chooser:function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}},init:function(e){var t=M.util.image_url("e/insert_edit_link","core");M.editor_atto.add_toolbar_button(e.elementid,"link",t,e.group,this.display_chooser,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r,i;if(!t)return;n=M.atto_link.find_selected_anchors(e.one(t)),n.length>0&&(r=n[0],M.atto_link.selection=M.editor_atto.get_selection_from_node(r),i=r.getAttribute("href"),target=r.getAttribute("target"),i!==""&&e.one("#atto_link_urlentry").set("value",i),target==="_blank"?e.one("#atto_link_openinnewwindow").set("checked","checked"):e.one("#atto_link_openinnewwindow").set("checked",""))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(t,n){var r,i,s,o,u;t.preventDefault(),M.atto_link.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("input[type=url]"),u=r.get("value");if(u!==""){M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,u),s=M.editor_atto.get_selection_parent_node();if(!s)return;o=M.atto_link.find_selected_anchors(e.one(s)),e.Array.each(o,function(e){i=t.currentTarget.ancestor(".atto_form").one("input[type=checkbox]"),i.get("checked")?e.setAttribute("target","_blank"):e.removeAttribute("target")}),M.editor_atto.text_updated(n)}},find_selected_anchors:function(e){var t=e.get("tagName"),n,r;return t&&t.toLowerCase()==="a"?[e]:(r=[],e.all("a").each(function(e){!n&&M.editor_atto.selection_contains_node(e)&&r.push(e)}),r.length>0?r:(n=e.ancestor("a"),n?[n]:[]))},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';M.editor_atto.can_show_filepicker(t,"link")&&(n+='<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'" type="button" >'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<br/>"),n+='<input type="checkbox" id="atto_link_openinnewwindow"/><label class="sameline" for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label>"+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button type="submit" id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link");var r=e.Node.create(n);return r.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link,this,t),M.editor_atto.can_show_filepicker(t,"link")&&r.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),r}}},"@VERSION@",{requires:["node","escape"]});
diff --git a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
index 253db5a530c..bfc2ef57b83 100644
--- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
+++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
@@ -243,7 +243,7 @@ M.atto_link = M.atto_link || {
                    '</label>' +
                    '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
-            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button" >' +
                     M.util.get_string('browserepositories', 'atto_link') +
                     '</button>' +
                     '<br/>';
@@ -254,7 +254,7 @@ M.atto_link = M.atto_link || {
                 '<br/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_link_urlentrysubmit">' +
+                '<button type="submit" id="atto_link_urlentrysubmit">' +
                 M.util.get_string('createlink', 'atto_link') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/link/yui/src/button/js/button.js b/lib/editor/atto/plugins/link/yui/src/button/js/button.js
index 1bd20182c1f..362c532f8d1 100644
--- a/lib/editor/atto/plugins/link/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/link/yui/src/button/js/button.js
@@ -241,7 +241,7 @@ M.atto_link = M.atto_link || {
                    '</label>' +
                    '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
         if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
-            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button" >' +
                     M.util.get_string('browserepositories', 'atto_link') +
                     '</button>' +
                     '<br/>';
@@ -252,7 +252,7 @@ M.atto_link = M.atto_link || {
                 '<br/>' +
                 '<div class="mdl-align">' +
                 '<br/>' +
-                '<button id="atto_link_urlentrysubmit">' +
+                '<button type="submit" id="atto_link_urlentrysubmit">' +
                 M.util.get_string('createlink', 'atto_link') +
                 '</button>' +
                 '</div>' +
diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
index 8bda5eacac3..fb48526b805 100644
--- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
+++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-debug.js
@@ -103,7 +103,7 @@ M.atto_media = M.atto_media || {
                              '<label for="atto_media_urlentry">' + M.util.get_string('enterurl', 'atto_media') +
                              '</label>' +
                              '<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>' +
-                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                              M.util.get_string('browserepositories', 'atto_media') +
                              '</button>' +
                              '<label for="atto_media_nameentry">' + M.util.get_string('entername', 'atto_media') +
@@ -111,7 +111,7 @@ M.atto_media = M.atto_media || {
                              '<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_media_urlentrysubmit">' +
+                             '<button id="atto_media_urlentrysubmit" type="submit">' +
                              M.util.get_string('createmedia', 'atto_media') +
                              '</button>' +
                              '</div>' +
diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
index 3a246f7aa84..c623c74cc0a 100644
--- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
+++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){if(!M.editor_atto.can_show_filepicker(e.elementid,"media"))return;var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}},n=M.util.image_url("e/insert_edit_video","core");M.editor_atto.add_toolbar_button(e.elementid,"media",n,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t,n){t.preventDefault(),M.atto_media.dialogue.hide();var r=t.currentTarget.ancestor(".atto_form").one("#atto_media_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_media_nameentry");var s=r.get("value");if(i!==""&&s!==""){M.editor_atto.set_selection(M.atto_media.selection);var o='<a href="'+e.Escape.html(i)+'">'+s+"</a>";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(o):document.execCommand("insertHTML",!1,o),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_media_urlentry">'+M.util.get_string("enterurl","atto_media")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>'+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_media")+"</button>"+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_media_urlentrysubmit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media,this,t),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]});
+YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){if(!M.editor_atto.can_show_filepicker(e.elementid,"media"))return;var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}},n=M.util.image_url("e/insert_edit_video","core");M.editor_atto.add_toolbar_button(e.elementid,"media",n,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t,n){t.preventDefault(),M.atto_media.dialogue.hide();var r=t.currentTarget.ancestor(".atto_form").one("#atto_media_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_media_nameentry");var s=r.get("value");if(i!==""&&s!==""){M.editor_atto.set_selection(M.atto_media.selection);var o='<a href="'+e.Escape.html(i)+'">'+s+"</a>";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(o):document.execCommand("insertHTML",!1,o),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_media_urlentry">'+M.util.get_string("enterurl","atto_media")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>'+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'" type="button">'+M.util.get_string("browserepositories","atto_media")+"</button>"+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_media_urlentrysubmit" type="submit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media,this,t),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]});
diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js
index 8bda5eacac3..fb48526b805 100644
--- a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js
+++ b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button.js
@@ -103,7 +103,7 @@ M.atto_media = M.atto_media || {
                              '<label for="atto_media_urlentry">' + M.util.get_string('enterurl', 'atto_media') +
                              '</label>' +
                              '<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>' +
-                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                              M.util.get_string('browserepositories', 'atto_media') +
                              '</button>' +
                              '<label for="atto_media_nameentry">' + M.util.get_string('entername', 'atto_media') +
@@ -111,7 +111,7 @@ M.atto_media = M.atto_media || {
                              '<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_media_urlentrysubmit">' +
+                             '<button id="atto_media_urlentrysubmit" type="submit">' +
                              M.util.get_string('createmedia', 'atto_media') +
                              '</button>' +
                              '</div>' +
diff --git a/lib/editor/atto/plugins/media/yui/src/button/js/button.js b/lib/editor/atto/plugins/media/yui/src/button/js/button.js
index 1a108a5eb90..935637460c6 100644
--- a/lib/editor/atto/plugins/media/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/media/yui/src/button/js/button.js
@@ -101,7 +101,7 @@ M.atto_media = M.atto_media || {
                              '<label for="atto_media_urlentry">' + M.util.get_string('enterurl', 'atto_media') +
                              '</label>' +
                              '<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>' +
-                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                             '<button id="openmediabrowser" data-editor="' + Y.Escape.html(elementid) + '" type="button">' +
                              M.util.get_string('browserepositories', 'atto_media') +
                              '</button>' +
                              '<label for="atto_media_nameentry">' + M.util.get_string('entername', 'atto_media') +
@@ -109,7 +109,7 @@ M.atto_media = M.atto_media || {
                              '<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_media_urlentrysubmit">' +
+                             '<button id="atto_media_urlentrysubmit" type="submit">' +
                              M.util.get_string('createmedia', 'atto_media') +
                              '</button>' +
                              '</div>' +
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
index 023674cd882..e1183c930f4 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
@@ -608,7 +608,7 @@ M.atto_table = M.atto_table || {
                              '<br/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_table_submit">' +
+                             '<button id="atto_table_submit" type="submit">' +
                              M.util.get_string('createtable', 'atto_table') +
                              '</button>' +
                              '</div>' +
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
index 22fe8ab1164..a1f366e6234 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
@@ -1,2 +1,2 @@
 YUI.add("moodle-atto_table-button",function(e,t){M.atto_table=M.atto_table||{dialogue:null,selection:null,menunode:null,controlmenu:null,lasttarget:null,display_chooser:function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_table.selection=M.editor_atto.get_selection();if(M.atto_table.selection!==!1&&!M.atto_table.selection.collapsed){var n;M.atto_table.dialogue?n=M.atto_table.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_table.get_form_content(t)),n.set("headerContent",M.util.get_string("createtable","atto_table")),n.show(),M.atto_table.dialogue=n}},show_menu:function(t,n){var r=!1;t.preventDefault();if(this.controlmenu===null){r=!0;var i="<ul>";i+='<li><a href="#" id="addcolumnafter">'+M.util.get_string("addcolumnafter","atto_table")+"</a></li>",i+='<li><a href="#" id="addrowafter">'+M.util.get_string("addrowafter","atto_table")+"</a></li>",i+='<li><a href="#" id="moverowup">'+M.util.get_string("moverowup","atto_table")+"</a></li>",i+='<li><a href="#" id="moverowdown">'+M.util.get_string("moverowdown","atto_table")+"</a></li>",i+='<li><a href="#" id="movecolumnleft">'+M.util.get_string("movecolumnleft","atto_table")+"</a></li>",i+='<li><a href="#" id="movecolumnright">'+M.util.get_string("movecolumnright","atto_table")+"</a></li>",i+='<li><a href="#" id="deleterow">'+M.util.get_string("deleterow","atto_table")+"</a></li>",i+='<li><a href="#" id="deletecolumn">'+M.util.get_string("deletecolumn","atto_table")+"</a></li>",i+="</ul>",this.controlmenu=new M.editor_atto.controlmenu({headerText:M.util.get_string("edittable","atto_table"),bodyContent:i})}this.lasttarget=t.target.ancestor("td, th"),this.controlmenu.show(),this.controlmenu.align(t.target,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]);if(r){var s=this.controlmenu.get("boundingBox");s.delegate("click",this.handle_table_control,"a",this,n),s.delegate("key",this.handle_table_control,"down:enter,space","a",this,n)}},get_row_index:function(e){var t=e.ancestor("table"),n=e.ancestor("tr");if(!t||!n)return;var r=t.all("tr");return r.indexOf(n)},get_column_index:function(e){var t=e.ancestor("tr");if(!t)return;var n=t.all("td, th");return n.indexOf(e)},delete_row:function(e){var t=this.lasttarget.ancestor("tr");t&&t.one("td")&&t.remove(!0),M.editor_atto.text_updated(e)},move_row_up:function(e){var t=this.lasttarget.ancestor("tr"),n=t.previous("tr");if(!t||!n)return;t.swap(n),M.editor_atto.text_updated(e)},move_column_left:function(t){var n=this.get_column_index(this.lasttarget),r=this.lasttarget.ancestor("table").all("tr"),i=new e.NodeList,s=new e.NodeList,o=!1;r.each(function(e){var t=e.all("td, th"),r=t.item(n),u=t.item(n-1);i.push(r),u&&(u.get("tagName")==="TD"&&(o=!0),s.push(u))});if(o&&s.size()>0){var u=0;for(u=0;u<i.size();u++){var a=i.item(u),f=s.item(u);a.swap(f)}}M.editor_atto.text_updated(t)},move_column_right:function(t){var n=this.get_column_index(this.lasttarget),r=this.lasttarget.ancestor("table").all("tr"),i=new e.NodeList,s=new e.NodeList,o=!1;r.each(function(e){var t=e.all("td, th"),r=t.item(n),u=t.item(n+1);r.get("tagName")==="TD"&&(o=!0),i.push(r),u&&s.push(u)});if(o&&s.size()>0){var u=0;for(u=0;u<i.size();u++){var a=i.item(u),f=s.item(u);a.swap(f)}}M.editor_atto.text_updated(t)},move_row_down:function(e){var t=this.lasttarget.ancestor("tr"),n=t.next("tr");if(!t||!n)return;t.swap(n),M.editor_atto.text_updated(e)},delete_column:function(t){var n=this.get_column_index(this.lasttarget),r=this.lasttarget.ancestor("table").all("tr"),i=new e.NodeList,s=!1;r.each(function(e){var t=e.all("td, th"),r=t.item(n);r.get("tagName")==="TD"&&(s=!0),i.push(r)}),s&&i.remove(!0),M.editor_atto.text_updated(t)},add_row_after:function(t){var n=this.get_row_index(this.lasttarget),r=this.lasttarget.ancestor("table").one("tbody");r||(r=this.lasttarget.ancestor("table"),n+=1);var i=r.one("tr");i||(i=this.lasttarget.ancestor("table").one("tr"));if(!i)return;newrow=i.cloneNode(!0),newrow.all("th, td").each(function(t){if(t.get("tagName")==="TH"&&t.getAttribute("scope")!=="row"){var n=e.Node.create("<td></td>");t.replace(n),t=n}t.setHTML("&nbsp;")}),r.insert(newrow,n),M.editor_atto.text_updated(t)},add_column_after:function(t){var n=this.get_column_index(this.lasttarget),r=this.lasttarget.ancestor("table"),i=r.all("tr");e.each(i,function(e){var t=e.one("td, th").cloneNode(!0);t.setHTML("&nbsp;"),e.insert(t,n+1)},this),M.editor_atto.text_updated(t)},handle_table_control:function(e,t){e.preventDefault(),this.controlmenu.hide();switch(e.target.get("id")){case"addcolumnafter":this.add_column_after(t);break;case"addrowafter":this.add_row_after(t);break;case"deleterow":this.delete_row(t);break;case"deletecolumn":this.delete_column(t);break;case"moverowdown":this.move_row_down(t);break;case"moverowup":this.move_row_up(t);break;case"movecolumnleft":this.move_column_left(t);break;case"movecolumnright":this.move_column_right(t)}},init:function(t){if(!M.atto_table.menunode){var n=e.Node.create("<img/>");n.setAttrs({alt:M.util.get_string("edittable","atto_table"),src:M.util.image_url("t/contextmenu","core"),width:"12",height:"12"});var r=e.Node.create('<a href="#" contenteditable="false"/>');r.appendChild(n),r.addClass("atto_control"),M.atto_table.menunode=r}var i=M.util.image_url("e/table","core");M.editor_atto.add_toolbar_button(t.elementid,"table",i,t.group,this.display_chooser,this);var s=M.editor_atto.get_editable_node(t.elementid);s.delegate("click",this.show_menu,"td > .atto_control, th > .atto_control",this,t.elementid),s.delegate("key",this.show_menu,"down:enter,space","td > .atto_control, th > .atto_control",this,t.elementid),e.UA.gecko&&(document.execCommand("enableInlineTableEditing",!1,"false"),document.execCommand("enableObjectResizing",!1,!1)),this.insert_table_controls(t.elementid),M.editor_atto.add_text_updated_handler(t.elementid,this.insert_table_controls)},insert_table_controls:function(e){var t=M.editor_atto.get_editable_node(e),n=t.
-all("td .atto_control,th .atto_control"),r=t.all("td:last-child,th:last-child,tbody tr:last-child > td, tbody tr:last-child > th");n.each(function(e){r.indexOf(e)===-1&&e.remove(!0)}),r.each(function(e){e.one(".atto_control")||e.append(M.atto_table.menunode.cloneNode(!0))},this)},set_table:function(t,n){var r,i,s,o,u,a,f;t.preventDefault(),M.atto_table.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("#atto_table_caption"),i=t.currentTarget.ancestor(".atto_form").one("#atto_table_rows"),s=t.currentTarget.ancestor(".atto_form").one("#atto_table_columns"),o=t.currentTarget.ancestor(".atto_form").one("#atto_table_headers"),M.editor_atto.set_selection(M.atto_table.selection),u="<br/><table>",u+="<caption>"+e.Escape.html(r.get("value"))+"</caption>",a=0;if(o.get("value")==="columns"||o.get("value")==="both"){a=1,u+="<thead><tr>";for(f=0;f<parseInt(s.get("value"),10);f++)u+='<th scope="col"></th>';u+="</tr></thead>"}u+="<tbody>";for(;a<parseInt(i.get("value"),10);a++){u+="<tr>";for(f=0;f<parseInt(s.get("value"),10);f++)f!==0||o.get("value")!=="rows"&&o.get("value")!=="both"?u+="<td></td>":u+='<th scope="row"></th>';u+="</tr>"}u+="</tbody>",u+="</table><br/>",document.execCommand("insertHTML",!1,u),M.editor_atto.text_updated(n)},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_table_caption">'+M.util.get_string("caption","atto_table")+"</label>"+'<textarea id="atto_table_caption" rows="4" class="fullwidth" required></textarea>'+"<br/>"+'<label for="atto_table_headers" class="sameline">'+M.util.get_string("headers","atto_table")+"</label>"+'<select id="atto_table_headers">'+'<option value="columns">'+M.util.get_string("columns","atto_table")+"</option>"+'<option value="rows">'+M.util.get_string("rows","atto_table")+"</option>"+'<option value="both">'+M.util.get_string("both","atto_table")+"</option>"+"</select>"+"<br/>"+'<label for="atto_table_rows" class="sameline">'+M.util.get_string("numberofrows","atto_table")+"</label>"+'<input type="number" value="3" id="atto_table_rows" size="8" min="1" max="50"/>'+"<br/>"+'<label for="atto_table_columns" class="sameline">'+M.util.get_string("numberofcolumns","atto_table")+"</label>"+'<input type="number" value="3" id="atto_table_columns" size="8" min="1" max="20"/>'+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button id="atto_table_submit">'+M.util.get_string("createtable","atto_table")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_table"));return n.one("#atto_table_submit").on("click",M.atto_table.set_table,this,t),n}}},"@VERSION@",{requires:["node","escape","event","event-valuechange"]});
+all("td .atto_control,th .atto_control"),r=t.all("td:last-child,th:last-child,tbody tr:last-child > td, tbody tr:last-child > th");n.each(function(e){r.indexOf(e)===-1&&e.remove(!0)}),r.each(function(e){e.one(".atto_control")||e.append(M.atto_table.menunode.cloneNode(!0))},this)},set_table:function(t,n){var r,i,s,o,u,a,f;t.preventDefault(),M.atto_table.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("#atto_table_caption"),i=t.currentTarget.ancestor(".atto_form").one("#atto_table_rows"),s=t.currentTarget.ancestor(".atto_form").one("#atto_table_columns"),o=t.currentTarget.ancestor(".atto_form").one("#atto_table_headers"),M.editor_atto.set_selection(M.atto_table.selection),u="<br/><table>",u+="<caption>"+e.Escape.html(r.get("value"))+"</caption>",a=0;if(o.get("value")==="columns"||o.get("value")==="both"){a=1,u+="<thead><tr>";for(f=0;f<parseInt(s.get("value"),10);f++)u+='<th scope="col"></th>';u+="</tr></thead>"}u+="<tbody>";for(;a<parseInt(i.get("value"),10);a++){u+="<tr>";for(f=0;f<parseInt(s.get("value"),10);f++)f!==0||o.get("value")!=="rows"&&o.get("value")!=="both"?u+="<td></td>":u+='<th scope="row"></th>';u+="</tr>"}u+="</tbody>",u+="</table><br/>",document.execCommand("insertHTML",!1,u),M.editor_atto.text_updated(n)},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_table_caption">'+M.util.get_string("caption","atto_table")+"</label>"+'<textarea id="atto_table_caption" rows="4" class="fullwidth" required></textarea>'+"<br/>"+'<label for="atto_table_headers" class="sameline">'+M.util.get_string("headers","atto_table")+"</label>"+'<select id="atto_table_headers">'+'<option value="columns">'+M.util.get_string("columns","atto_table")+"</option>"+'<option value="rows">'+M.util.get_string("rows","atto_table")+"</option>"+'<option value="both">'+M.util.get_string("both","atto_table")+"</option>"+"</select>"+"<br/>"+'<label for="atto_table_rows" class="sameline">'+M.util.get_string("numberofrows","atto_table")+"</label>"+'<input type="number" value="3" id="atto_table_rows" size="8" min="1" max="50"/>'+"<br/>"+'<label for="atto_table_columns" class="sameline">'+M.util.get_string("numberofcolumns","atto_table")+"</label>"+'<input type="number" value="3" id="atto_table_columns" size="8" min="1" max="20"/>'+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button id="atto_table_submit" type="submit">'+M.util.get_string("createtable","atto_table")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_table"));return n.one("#atto_table_submit").on("click",M.atto_table.set_table,this,t),n}}},"@VERSION@",{requires:["node","escape","event","event-valuechange"]});
diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
index 023674cd882..e1183c930f4 100644
--- a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
+++ b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
@@ -608,7 +608,7 @@ M.atto_table = M.atto_table || {
                              '<br/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_table_submit">' +
+                             '<button id="atto_table_submit" type="submit">' +
                              M.util.get_string('createtable', 'atto_table') +
                              '</button>' +
                              '</div>' +
diff --git a/lib/editor/atto/plugins/table/yui/src/button/js/button.js b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
index 920f0fb1c6c..8cd037ca02a 100644
--- a/lib/editor/atto/plugins/table/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
@@ -606,7 +606,7 @@ M.atto_table = M.atto_table || {
                              '<br/>' +
                              '<div class="mdl-align">' +
                              '<br/>' +
-                             '<button id="atto_table_submit">' +
+                             '<button id="atto_table_submit" type="submit">' +
                              M.util.get_string('createtable', 'atto_table') +
                              '</button>' +
                              '</div>' +