From 103ba42d846dfe9d9f9867ae9c0242c170be81c2 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 9 Oct 2013 11:08:06 +0800
Subject: [PATCH] MDL-41993 Atto: Always clean/update the textarea when the
 content is changed

---
 .../moodle-atto_bold-button-debug.js                   |  2 ++
 .../moodle-atto_bold-button-min.js                     |  2 +-
 .../moodle-atto_bold-button/moodle-atto_bold-button.js |  2 ++
 .../atto/plugins/bold/yui/src/button/js/button.js      |  2 ++
 .../moodle-atto_clear-button-debug.js                  |  2 ++
 .../moodle-atto_clear-button-min.js                    |  2 +-
 .../moodle-atto_clear-button.js                        |  2 ++
 .../atto/plugins/clear/yui/src/button/js/button.js     |  2 ++
 .../moodle-atto_image-button-debug.js                  |  6 ++++--
 .../moodle-atto_image-button-min.js                    |  2 +-
 .../moodle-atto_image-button.js                        |  6 ++++--
 .../atto/plugins/image/yui/src/button/js/button.js     |  6 ++++--
 .../moodle-atto_indent-button-debug.js                 |  2 ++
 .../moodle-atto_indent-button-min.js                   |  2 +-
 .../moodle-atto_indent-button.js                       |  2 ++
 .../atto/plugins/indent/yui/src/button/js/button.js    |  2 ++
 .../moodle-atto_italic-button-debug.js                 |  2 ++
 .../moodle-atto_italic-button-min.js                   |  2 +-
 .../moodle-atto_italic-button.js                       |  2 ++
 .../atto/plugins/italic/yui/src/button/js/button.js    |  2 ++
 .../moodle-atto_link-button-debug.js                   |  6 ++++--
 .../moodle-atto_link-button-min.js                     |  2 +-
 .../moodle-atto_link-button/moodle-atto_link-button.js |  6 ++++--
 .../atto/plugins/link/yui/src/button/js/button.js      |  6 ++++--
 .../moodle-atto_media-button-debug.js                  |  6 ++++--
 .../moodle-atto_media-button-min.js                    |  2 +-
 .../moodle-atto_media-button.js                        |  6 ++++--
 .../atto/plugins/media/yui/src/button/js/button.js     |  6 ++++--
 .../moodle-atto_orderedlist-button-debug.js            |  2 ++
 .../moodle-atto_orderedlist-button-min.js              |  2 +-
 .../moodle-atto_orderedlist-button.js                  |  2 ++
 .../plugins/orderedlist/yui/src/button/js/button.js    |  2 ++
 .../moodle-atto_outdent-button-debug.js                |  2 ++
 .../moodle-atto_outdent-button-min.js                  |  2 +-
 .../moodle-atto_outdent-button.js                      |  2 ++
 .../atto/plugins/outdent/yui/src/button/js/button.js   |  2 ++
 .../moodle-atto_strike-button-debug.js                 |  2 ++
 .../moodle-atto_strike-button-min.js                   |  2 +-
 .../moodle-atto_strike-button.js                       |  2 ++
 .../atto/plugins/strike/yui/src/button/js/button.js    |  2 ++
 .../moodle-atto_title-button-debug.js                  |  2 ++
 .../moodle-atto_title-button-min.js                    |  2 +-
 .../moodle-atto_title-button.js                        |  2 ++
 .../atto/plugins/title/yui/src/button/js/button.js     |  2 ++
 .../moodle-atto_underline-button-debug.js              |  2 ++
 .../moodle-atto_underline-button-min.js                |  2 +-
 .../moodle-atto_underline-button.js                    |  2 ++
 .../atto/plugins/underline/yui/src/button/js/button.js |  2 ++
 .../moodle-atto_unlink-button-debug.js                 |  2 ++
 .../moodle-atto_unlink-button-min.js                   |  2 +-
 .../moodle-atto_unlink-button.js                       |  2 ++
 .../atto/plugins/unlink/yui/src/button/js/button.js    |  2 ++
 .../moodle-atto_unorderedlist-button-debug.js          |  2 ++
 .../moodle-atto_unorderedlist-button-min.js            |  2 +-
 .../moodle-atto_unorderedlist-button.js                |  2 ++
 .../plugins/unorderedlist/yui/src/button/js/button.js  |  2 ++
 .../moodle-editor_atto-editor-debug.js                 | 10 ++++++++++
 .../moodle-editor_atto-editor-min.js                   |  4 ++--
 .../moodle-editor_atto-editor.js                       | 10 ++++++++++
 lib/editor/atto/yui/src/editor/js/editor.js            | 10 ++++++++++
 60 files changed, 148 insertions(+), 34 deletions(-)

diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
index 254c68dffd8..5e00ad397ff 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-debug.js
@@ -30,6 +30,8 @@ M.atto_bold = M.atto_bold || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('bold', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
index 14ec201a10e..b83c7a8f3ea 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_bold-button",function(e,t){M.atto_bold=M.atto_bold||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("bold",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"bold",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
index 254c68dffd8..5e00ad397ff 100644
--- a/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
+++ b/lib/editor/atto/plugins/bold/yui/build/moodle-atto_bold-button/moodle-atto_bold-button.js
@@ -30,6 +30,8 @@ M.atto_bold = M.atto_bold || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('bold', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
index 0522419dc0d..f48b4ec66da 100644
--- a/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/bold/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_bold = M.atto_bold || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('bold', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'bold', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
index 0efa72c4d43..5a4187ca828 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-debug.js
@@ -30,6 +30,8 @@ M.atto_clear = M.atto_clear || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('removeFormat', false);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
index 4a1ad9753bc..a8c661cf363 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_clear-button",function(e,t){M.atto_clear=M.atto_clear||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("removeFormat",!1),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"clear",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
index 0efa72c4d43..5a4187ca828 100644
--- a/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
+++ b/lib/editor/atto/plugins/clear/yui/build/moodle-atto_clear-button/moodle-atto_clear-button.js
@@ -30,6 +30,8 @@ M.atto_clear = M.atto_clear || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('removeFormat', false);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
index 77d6d1ecc4c..5630e0af88c 100644
--- a/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/clear/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_clear = M.atto_clear || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('removeFormat', false);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'clear', params.icon, params.group, click);
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 d8c624d88f3..7d1a545ed27 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
@@ -113,7 +113,7 @@ M.atto_image = M.atto_image || {
             image.src = params.url;
         }
     },
-    set_image : function(e) {
+    set_image : function(e, elementid) {
         e.preventDefault();
         M.atto_image.dialogue.hide();
 
@@ -143,6 +143,8 @@ M.atto_image = M.atto_image || {
             } else {
                 document.execCommand('insertHTML', false, imagehtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -174,7 +176,7 @@ M.atto_image = M.atto_image || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
 
-        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image);
+        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
         content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
         return content;
     }
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 d48973263fd..66ecfab822b 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 +1 @@
-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"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,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),n=e.one("#atto_image_altentry"),n.set("value",t.file);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}},set_image:function(t){t.preventDefault(),M.atto_image.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_altentry");var i=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var s=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var o=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_image.selection);var u='<img src="'+e.Escape.html(r)+'" alt="'+e.Escape.html(i)+'"';s&&(u+=' width="'+e.Escape.html(s)+'"'),o&&(u+=' height="'+e.Escape.html(o)+'"'),u+='"/>',document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(u):document.execCommand("insertHTML",!1,u)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input type="url" value="" id="atto_image_urlentry" size="32"/>'+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_altentry" size="32" required="true"/>'+'<label for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+'<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;"/>'+"<hr/>"+'<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<hr/>"+'<button id="atto_image_urlentrysubmit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@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"))}r.show()}};M.editor_atto.add_toolbar_button(t.elementid,"image",t.icon,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),n=e.one("#atto_image_altentry"),n.set("value",t.file);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}},set_image:function(t,n){t.preventDefault(),M.atto_image.dialogue.hide();var r=t.currentTarget.get("parentNode").one("#atto_image_urlentry"),i=r.get("value");r=t.currentTarget.get("parentNode").one("#atto_image_altentry");var s=r.get("value");r=t.currentTarget.get("parentNode").one("#atto_image_widthentry");var o=r.get("value");r=t.currentTarget.get("parentNode").one("#atto_image_heightentry");var u=r.get("value");if(i!==""&&s!==""){M.editor_atto.set_selection(M.atto_image.selection);var a='<img src="'+e.Escape.html(i)+'" alt="'+e.Escape.html(s)+'"';o&&(a+=' width="'+e.Escape.html(o)+'"'),u&&(a+=' height="'+e.Escape.html(u)+'"'),a+='"/>',document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(a):document.execCommand("insertHTML",!1,a),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input type="url" value="" id="atto_image_urlentry" size="32"/>'+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_altentry" size="32" required="true"/>'+'<label for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+'<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;"/>'+"<hr/>"+'<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<hr/>"+'<button id="atto_image_urlentrysubmit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image,this,t),n.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),n}}},"@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 d8c624d88f3..7d1a545ed27 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
@@ -113,7 +113,7 @@ M.atto_image = M.atto_image || {
             image.src = params.url;
         }
     },
-    set_image : function(e) {
+    set_image : function(e, elementid) {
         e.preventDefault();
         M.atto_image.dialogue.hide();
 
@@ -143,6 +143,8 @@ M.atto_image = M.atto_image || {
             } else {
                 document.execCommand('insertHTML', false, imagehtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -174,7 +176,7 @@ M.atto_image = M.atto_image || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
 
-        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image);
+        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
         content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
         return content;
     }
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 791d2242aea..fb862964b75 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
@@ -111,7 +111,7 @@ M.atto_image = M.atto_image || {
             image.src = params.url;
         }
     },
-    set_image : function(e) {
+    set_image : function(e, elementid) {
         e.preventDefault();
         M.atto_image.dialogue.hide();
 
@@ -141,6 +141,8 @@ M.atto_image = M.atto_image || {
             } else {
                 document.execCommand('insertHTML', false, imagehtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -172,7 +174,7 @@ M.atto_image = M.atto_image || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
 
-        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image);
+        content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
         content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
         return content;
     }
diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js
index aa393bfe012..f952bb08a68 100644
--- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js
+++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-debug.js
@@ -30,6 +30,8 @@ M.atto_indent = M.atto_indent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('indent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js
index 6e10e44ee1b..cd35231daca 100644
--- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js
+++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_indent-button",function(e,t){M.atto_indent=M.atto_indent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("indent",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"indent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js
index aa393bfe012..f952bb08a68 100644
--- a/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js
+++ b/lib/editor/atto/plugins/indent/yui/build/moodle-atto_indent-button/moodle-atto_indent-button.js
@@ -30,6 +30,8 @@ M.atto_indent = M.atto_indent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('indent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click);
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
index 4e6ce3aa276..79b73a541da 100644
--- a/lib/editor/atto/plugins/indent/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/indent/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_indent = M.atto_indent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('indent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'indent', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js
index 78b18b25b6c..1cab99f2fc0 100644
--- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js
+++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-debug.js
@@ -30,6 +30,8 @@ M.atto_italic = M.atto_italic || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('italic', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js
index 8e51967a5e5..545816717d3 100644
--- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js
+++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_italic-button",function(e,t){M.atto_italic=M.atto_italic||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("italic",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"italic",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js
index 78b18b25b6c..1cab99f2fc0 100644
--- a/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js
+++ b/lib/editor/atto/plugins/italic/yui/build/moodle-atto_italic-button/moodle-atto_italic-button.js
@@ -30,6 +30,8 @@ M.atto_italic = M.atto_italic || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('italic', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js
index d7da568e8f7..349ad9426da 100644
--- a/lib/editor/atto/plugins/italic/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/italic/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_italic = M.atto_italic || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('italic', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'italic', params.icon, params.group, click);
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 7f8858606dc..87bb3d854cc 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
@@ -158,7 +158,7 @@ M.atto_link = M.atto_link || {
      * @method set_link
      * @param Event e
      */
-    set_link : function(e) {
+    set_link : function(e, elementid) {
         var input,
             target,
             selectednode,
@@ -193,6 +193,8 @@ M.atto_link = M.atto_link || {
                     anchornode.removeAttribute('target');
                 }
             });
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
 
@@ -254,7 +256,7 @@ M.atto_link = M.atto_link || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
 
-        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link);
+        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
         content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
         return content;
     }
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 1434aed6869..f2600796d0d 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){M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,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){var n,r,i,s,o;t.preventDefault(),M.atto_link.dialogue.hide(),n=t.currentTarget.get("parentNode").one("input[type=url]"),o=n.get("value");if(o!==""){M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,o),i=M.editor_atto.get_selection_parent_node();if(!i)return;s=M.atto_link.find_selected_anchors(e.one(i)),e.Array.each(s,function(e){r=t.currentTarget.get("parentNode").one("input[type=checkbox]"),r.get("checked")?e.setAttribute("target","_blank"):e.removeAttribute("target")})}},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=e.Node.create('<form><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label><br/>"+'<input type="url" value="" id="atto_link_urlentry" size="32"/>'+"<br/>"+'<label for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label><br/>"+'<input type="checkbox" id="atto_link_openinnewwindow"/>'+"<br/>"+'<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<hr/>"+'<button id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@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){M.editor_atto.add_toolbar_button(e.elementid,"link",e.icon,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.get("parentNode").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.get("parentNode").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=e.Node.create('<form><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label><br/>"+'<input type="url" value="" id="atto_link_urlentry" size="32"/>'+"<br/>"+'<label for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label><br/>"+'<input type="checkbox" id="atto_link_openinnewwindow"/>'+"<br/>"+'<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<hr/>"+'<button id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link"));return n.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link,this,t),n.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),n}}},"@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 7f8858606dc..87bb3d854cc 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
@@ -158,7 +158,7 @@ M.atto_link = M.atto_link || {
      * @method set_link
      * @param Event e
      */
-    set_link : function(e) {
+    set_link : function(e, elementid) {
         var input,
             target,
             selectednode,
@@ -193,6 +193,8 @@ M.atto_link = M.atto_link || {
                     anchornode.removeAttribute('target');
                 }
             });
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
 
@@ -254,7 +256,7 @@ M.atto_link = M.atto_link || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
 
-        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link);
+        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
         content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
         return content;
     }
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 71d74b9da9c..7437badf399 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
@@ -156,7 +156,7 @@ M.atto_link = M.atto_link || {
      * @method set_link
      * @param Event e
      */
-    set_link : function(e) {
+    set_link : function(e, elementid) {
         var input,
             target,
             selectednode,
@@ -191,6 +191,8 @@ M.atto_link = M.atto_link || {
                     anchornode.removeAttribute('target');
                 }
             });
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
 
@@ -252,7 +254,7 @@ M.atto_link = M.atto_link || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
 
-        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link);
+        content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
         content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
         return content;
     }
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 e4fcc22e3f4..5b5541d2aef 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
@@ -70,7 +70,7 @@ M.atto_media = M.atto_media || {
             input.set('value', params.file);
         }
     },
-    set_media : function(e) {
+    set_media : function(e, elementid) {
         e.preventDefault();
         M.atto_media.dialogue.hide();
 
@@ -88,6 +88,8 @@ M.atto_media = M.atto_media || {
             } else {
                 document.execCommand('insertHTML', false, mediahtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -109,7 +111,7 @@ M.atto_media = M.atto_media || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_media'));
 
-        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media);
+        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media, this, elementid);
         content.one('#openmediabrowser').on('click', M.atto_media.open_browser);
         return content;
     }
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 5faab6eb045..d7136e9c816 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){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}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,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){t.preventDefault(),M.atto_media.dialogue.hide();var n=t.currentTarget.get("parentNode").one("#atto_media_urlentry"),r=n.get("value");n=t.currentTarget.get("parentNode").one("#atto_media_nameentry");var i=n.get("value");if(r!==""&&i!==""){M.editor_atto.set_selection(M.atto_media.selection);var s='<a href="'+e.Escape.html(r)+'">'+i+"</a>";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(s):document.execCommand("insertHTML",!1,s)}},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 type="url" value="" id="atto_media_urlentry" size="32"/>'+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+"<hr/>"+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_media")+"</button>"+"<hr/>"+'<button id="atto_media_urlentrysubmit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media),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){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}};M.editor_atto.add_toolbar_button(e.elementid,"media",e.icon,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.get("parentNode").one("#atto_media_urlentry"),i=r.get("value");r=t.currentTarget.get("parentNode").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 type="url" value="" id="atto_media_urlentry" size="32"/>'+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+"<hr/>"+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_media")+"</button>"+"<hr/>"+'<button id="atto_media_urlentrysubmit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</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 e4fcc22e3f4..5b5541d2aef 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
@@ -70,7 +70,7 @@ M.atto_media = M.atto_media || {
             input.set('value', params.file);
         }
     },
-    set_media : function(e) {
+    set_media : function(e, elementid) {
         e.preventDefault();
         M.atto_media.dialogue.hide();
 
@@ -88,6 +88,8 @@ M.atto_media = M.atto_media || {
             } else {
                 document.execCommand('insertHTML', false, mediahtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -109,7 +111,7 @@ M.atto_media = M.atto_media || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_media'));
 
-        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media);
+        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media, this, elementid);
         content.one('#openmediabrowser').on('click', M.atto_media.open_browser);
         return content;
     }
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 70fe607198f..6e078baa83c 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
@@ -68,7 +68,7 @@ M.atto_media = M.atto_media || {
             input.set('value', params.file);
         }
     },
-    set_media : function(e) {
+    set_media : function(e, elementid) {
         e.preventDefault();
         M.atto_media.dialogue.hide();
 
@@ -86,6 +86,8 @@ M.atto_media = M.atto_media || {
             } else {
                 document.execCommand('insertHTML', false, mediahtml);
             }
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         }
     },
     get_form_content : function(elementid) {
@@ -107,7 +109,7 @@ M.atto_media = M.atto_media || {
                              '</form>' +
                              '<hr/>' + M.util.get_string('accessibilityhint', 'atto_media'));
 
-        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media);
+        content.one('#atto_media_urlentrysubmit').on('click', M.atto_media.set_media, this, elementid);
         content.one('#openmediabrowser').on('click', M.atto_media.open_browser);
         return content;
     }
diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js
index a2cc475acb3..4b19e1e757f 100644
--- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js
+++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-debug.js
@@ -30,6 +30,8 @@ M.atto_orderedlist = M.atto_orderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertOrderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js
index d5cc7646679..c1863bd3a6e 100644
--- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js
+++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_orderedlist-button",function(e,t){M.atto_orderedlist=M.atto_orderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertOrderedList",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"orderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js
index a2cc475acb3..4b19e1e757f 100644
--- a/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js
+++ b/lib/editor/atto/plugins/orderedlist/yui/build/moodle-atto_orderedlist-button/moodle-atto_orderedlist-button.js
@@ -30,6 +30,8 @@ M.atto_orderedlist = M.atto_orderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertOrderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js
index 93a00c08597..eb3f83423a0 100644
--- a/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/orderedlist/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_orderedlist = M.atto_orderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertOrderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'orderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js
index c0a4827d4d1..4224011908d 100644
--- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js
+++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-debug.js
@@ -30,6 +30,8 @@ M.atto_outdent = M.atto_outdent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('outdent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js
index 16df6c46ae8..f86a8cda522 100644
--- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js
+++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_outdent-button",function(e,t){M.atto_outdent=M.atto_outdent||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("outdent",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"outdent",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js
index c0a4827d4d1..4224011908d 100644
--- a/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js
+++ b/lib/editor/atto/plugins/outdent/yui/build/moodle-atto_outdent-button/moodle-atto_outdent-button.js
@@ -30,6 +30,8 @@ M.atto_outdent = M.atto_outdent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('outdent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js
index 96e8a9c0b67..d3d67afddf2 100644
--- a/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/outdent/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_outdent = M.atto_outdent || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('outdent', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'outdent', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js
index 3807083bb86..d2a09428ff4 100644
--- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js
+++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-debug.js
@@ -30,6 +30,8 @@ M.atto_strike = M.atto_strike || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('strikeThrough', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js
index 873cb8c3c0d..067c1db0312 100644
--- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js
+++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_strike-button",function(e,t){M.atto_strike=M.atto_strike||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("strikeThrough",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"strike",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js
index 3807083bb86..d2a09428ff4 100644
--- a/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js
+++ b/lib/editor/atto/plugins/strike/yui/build/moodle-atto_strike-button/moodle-atto_strike-button.js
@@ -30,6 +30,8 @@ M.atto_strike = M.atto_strike || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('strikeThrough', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js
index c69ce0d1476..8e8505e2c57 100644
--- a/lib/editor/atto/plugins/strike/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/strike/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_strike = M.atto_strike || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('strikeThrough', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'strike', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js
index 9297739d755..a66644fe626 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-debug.js
@@ -76,6 +76,8 @@ M.atto_title = M.atto_title || {
             M.editor_atto.focus(elementid);
         }
         document.execCommand('formatBlock', false, node);
+        // Clean the YUI ids from the HTML.
+        M.editor_atto.text_updated(elementid);
     }
 };
 
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js
index 6465b9ce09c..32aae116bd8 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"<h3>")},n=function(e,t){M.atto_title.change_title(e,t,"<h4>")},r=function(e,t){M.atto_title.change_title(e,t,"<h5>")},i=function(e,t){M.atto_title.change_title(e,t,"<pre>")},s=function(e,t){M.atto_title.change_title(e,t,"<blockquote>")},o=function(e,t){M.atto_title.change_title(e,t,"<p>")},u=M.util.get_string("h3","atto_title"),a=M.util.get_string("h4","atto_title"),f=M.util.get_string("h5","atto_title"),l=M.util.get_string("pre","atto_title"),c=M.util.get_string("blockquote","atto_title"),h=M.util.get_string("p","atto_title");M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_title-button",function(e,t){M.atto_title=M.atto_title||{init:function(e){var t=function(e,t){M.atto_title.change_title(e,t,"<h3>")},n=function(e,t){M.atto_title.change_title(e,t,"<h4>")},r=function(e,t){M.atto_title.change_title(e,t,"<h5>")},i=function(e,t){M.atto_title.change_title(e,t,"<pre>")},s=function(e,t){M.atto_title.change_title(e,t,"<blockquote>")},o=function(e,t){M.atto_title.change_title(e,t,"<p>")},u=M.util.get_string("h3","atto_title"),a=M.util.get_string("h4","atto_title"),f=M.util.get_string("h5","atto_title"),l=M.util.get_string("pre","atto_title"),c=M.util.get_string("blockquote","atto_title"),h=M.util.get_string("p","atto_title");M.editor_atto.add_toolbar_menu(e.elementid,"title",e.icon,e.group,[{text:u,handler:t},{text:a,handler:n},{text:f,handler:r},{text:l,handler:i},{text:c,handler:s},{text:h,handler:o}])},change_title:function(e,t,n){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("formatBlock",!1,n),M.editor_atto.text_updated(t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
index 9297739d755..a66644fe626 100644
--- a/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
+++ b/lib/editor/atto/plugins/title/yui/build/moodle-atto_title-button/moodle-atto_title-button.js
@@ -76,6 +76,8 @@ M.atto_title = M.atto_title || {
             M.editor_atto.focus(elementid);
         }
         document.execCommand('formatBlock', false, node);
+        // Clean the YUI ids from the HTML.
+        M.editor_atto.text_updated(elementid);
     }
 };
 
diff --git a/lib/editor/atto/plugins/title/yui/src/button/js/button.js b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
index c2d6d9f5be1..1f5de116cb2 100644
--- a/lib/editor/atto/plugins/title/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/title/yui/src/button/js/button.js
@@ -74,5 +74,7 @@ M.atto_title = M.atto_title || {
             M.editor_atto.focus(elementid);
         }
         document.execCommand('formatBlock', false, node);
+        // Clean the YUI ids from the HTML.
+        M.editor_atto.text_updated(elementid);
     }
 };
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
index 218a6705384..1566a0f2813 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-debug.js
@@ -30,6 +30,8 @@ M.atto_underline = M.atto_underline || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('underline', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
index 86d3a2f098e..5880711bb21 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_underline-button",function(e,t){M.atto_underline=M.atto_underline||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("underline",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"underline",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
index 218a6705384..1566a0f2813 100644
--- a/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
+++ b/lib/editor/atto/plugins/underline/yui/build/moodle-atto_underline-button/moodle-atto_underline-button.js
@@ -30,6 +30,8 @@ M.atto_underline = M.atto_underline || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('underline', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
index 973461022af..1ea68b08940 100644
--- a/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/underline/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_underline = M.atto_underline || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('underline', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'underline', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
index 89959a891b3..b3d87f52cf5 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-debug.js
@@ -30,6 +30,8 @@ M.atto_unlink = M.atto_unlink || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('unlink', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
index c306b0a19ea..ebfb57b9cfd 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unlink-button",function(e,t){M.atto_unlink=M.atto_unlink||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("unlink",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"unlink",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
index 89959a891b3..b3d87f52cf5 100644
--- a/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
+++ b/lib/editor/atto/plugins/unlink/yui/build/moodle-atto_unlink-button/moodle-atto_unlink-button.js
@@ -30,6 +30,8 @@ M.atto_unlink = M.atto_unlink || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('unlink', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
index 73923fba978..e8cc4fd819a 100644
--- a/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unlink/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_unlink = M.atto_unlink || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('unlink', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unlink', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
index e430b83d2fc..6b9309a051a 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-debug.js
@@ -30,6 +30,8 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertUnorderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
index dc606fc7f52..1498365a7c8 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
+YUI.add("moodle-atto_unorderedlist-button",function(e,t){M.atto_unorderedlist=M.atto_unorderedlist||{init:function(e){var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),document.execCommand("insertUnorderedList",!1,null),M.editor_atto.text_updated(t)};M.editor_atto.add_toolbar_button(e.elementid,"unorderedlist",e.icon,e.group,t)}}},"@VERSION@",{requires:["node"]});
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
index e430b83d2fc..6b9309a051a 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/build/moodle-atto_unorderedlist-button/moodle-atto_unorderedlist-button.js
@@ -30,6 +30,8 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertUnorderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
index 6e1d30cf283..9a3895d1247 100644
--- a/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/unorderedlist/yui/src/button/js/button.js
@@ -28,6 +28,8 @@ M.atto_unorderedlist = M.atto_unorderedlist || {
                 M.editor_atto.focus(elementid);
             }
             document.execCommand('insertUnorderedList', false, null);
+            // Clean the YUI ids from the HTML.
+            M.editor_atto.text_updated(elementid);
         };
 
         M.editor_atto.add_toolbar_button(params.elementid, 'unorderedlist', params.icon, params.group, click);
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index 966612f4ca1..eb566d6dcb2 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
@@ -384,6 +384,16 @@ M.editor_atto = M.editor_atto || {
         M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
     },
 
+    /**
+     * The text in the contenteditable region has been updated,
+     * clean and copy the buffer to the text area.
+     * @param string elementid - the id of the textarea we created this editor from.
+     */
+    text_updated : function(elementid) {
+        var textarea = Y.one('#' + elementid);
+        textarea.set('value', this.get_clean_html(elementid));
+    },
+
     /**
      * Remove all YUI ids from the generated HTML.
      * @param string elementid - the id of the textarea we created this editor from.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index bff0fbaf428..cb8c4ad2b0e 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
@@ -1,2 +1,2 @@
-YUI.add("moodle-editor_atto-editor",function(e,t){CSS={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto"},M.editor_atto=M.editor_atto||{buttonhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},showhide_menu_handler:function(e){e.preventDefault();var t=this.getAttribute("disabled"),n=this.getAttribute("data-menu"),r=M.editor_atto.menus[n],i=r.get("bodyContent");r.get("visible")||t?(r.hide(),i.detach("clickoutside")):(i.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&r.get("visible")&&(i.detach("clickoutside"),r.hide())},this),r.show(),r.bodyNode.one("a").focus())},buttonclicked_handler:function(e){var t=this.getAttribute("data-editor"),n=this.getAttribute("data-plugin"),r=this.getAttribute("data-handler"),i=M.editor_atto.menus[n+"_"+t];i&&i.hide();if(M.editor_atto.is_enabled(t,n))return r=M.editor_atto.buttonhandlers[r],r(e,t)},is_enabled:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");return!r.hasAttribute("disabled")},disable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.setAttribute("disabled","true")},enable_widget:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");r&&r.removeAttribute("disabled")},enable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.removeAttribute("disabled")},add_toolbar_menu:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" >'+r+"</button>"),u.append(f),a=o.getAttribute("aria-activedescendant"),a||(f.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",f.generateID())),M.editor_atto.widgets[n]=n;var l=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),c=0,h={};for(c=0;c<s.length;c++)h=s[c],l.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+c+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+c)+'">'+h.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+c]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+c),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+c),M.editor_atto.buttonhandlers[n+"_action_"+c]=h.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var p=new M.core.dialogue({bodyContent:l,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,centered:!1,align:{node:f,points:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]}});M.editor_atto.menus[n+"_"+t]=p,p.render(),p.hide(),p.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),a=e.Node.create('<button class="atto_'+n+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(n)+'">'+r+"</button>"),u.append(a),f=o.getAttribute("aria-activedescendant"),f||(a.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",a.generateID())),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=s),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.one("#"+t.elementid),r=e.Node.create('<div class="'+CSS.WRAPPER+'" />'),i=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'spellcheck="true" '+'class="'+CSS.CONTENT+'" />'),s="",o=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar"/>'),u=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />');u.appendChild(i),r.appendChild(o),r.appendChild(u);var a=e.io(t.content_css,{sync:!0}),f=a.responseText.indexOf("font:");f&&(s=a.responseText.substring(f+"font:".length,a.responseText.length-1),i.setStyle("font",s)),i.setStyle("minHeight",1.2*n.getAttribute("rows")+"em"),i.append(n.get("value")),n.get("parentNode").insert(r,n),i.setStyle("color",n.getStyle("color")),i.setStyle("lineHeight",n.getStyle("lineHeight")),i.setStyle("fontSize",n.getStyle("fontSize")),n.hide(),i.on("blur",function(){n.set("value",this.get_clean_html(t.elementid))},this),e.one(e.config.doc.body).delegate("key",this.keyboard_navigation,"down:37,39","#"+t.elementid+"_toolbar",this,t.elementid),M.editor_atto.filepickeroptions[t.elementid]=t.filepickeroptions},get_clean_html:function(t){var n=e.one("#"+t+"editable");return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o;t.preventDefault(),r=e.all("#"+n+"_toolbar button"),s=e.one("#"+n+"_toolbar").getAttribute("aria-activedescendant");if(!s)return;i=e.one("#"+s),i.setAttribute("tabindex","-1"),o=r.indexOf(i),t.keyCode===37?(o--,o<0&&(o=r.size()-1)):(o++,o>=r.size()&&(o=0)),i=r.item(o),i.setAttribute("tabindex","0"),i.focus(),e.one("#"+n+"_toolbar").setAttribute("aria-activedescendant",i.generateID())},show_filepicker:function(t,n,r){e.use("core_filepicker",function(e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=
-e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t}return document.selection&&document.selection.createRange?document.selection.createRange():!1},selection_contains_node:function(e){var t,n;if(window.getSelection){n=window.getSelection();if(n.containsNode)return n.containsNode(e.getDOMNode(),!0)}return n=document.selection.createRange(),t=n.duplicate(),t.moveToElementText(e.getDOMNode()),n.inRange(t)},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();if(e.length>0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n<e.length;n++)t.addRange(e[n])}else document.selection&&e.select&&e.select()}}},"@VERSION@",{requires:["node","io","overlay","escape","event-key","moodle-core-notification"]});
+YUI.add("moodle-editor_atto-editor",function(e,t){CSS={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto"},M.editor_atto=M.editor_atto||{buttonhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},showhide_menu_handler:function(e){e.preventDefault();var t=this.getAttribute("disabled"),n=this.getAttribute("data-menu"),r=M.editor_atto.menus[n],i=r.get("bodyContent");r.get("visible")||t?(r.hide(),i.detach("clickoutside")):(i.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&r.get("visible")&&(i.detach("clickoutside"),r.hide())},this),r.show(),r.bodyNode.one("a").focus())},buttonclicked_handler:function(e){var t=this.getAttribute("data-editor"),n=this.getAttribute("data-plugin"),r=this.getAttribute("data-handler"),i=M.editor_atto.menus[n+"_"+t];i&&i.hide();if(M.editor_atto.is_enabled(t,n))return r=M.editor_atto.buttonhandlers[r],r(e,t)},is_enabled:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");return!r.hasAttribute("disabled")},disable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.setAttribute("disabled","true")},enable_widget:function(t,n){var r=e.one("#"+t+"_toolbar .atto_"+n+"_button");r&&r.removeAttribute("disabled")},enable_all_widgets:function(t){var n,r;for(n in M.editor_atto.widgets)r=e.one("#"+t+"_toolbar .atto_"+n+"_button"),r&&r.removeAttribute("disabled")},add_toolbar_menu:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" >'+r+"</button>"),u.append(f),a=o.getAttribute("aria-activedescendant"),a||(f.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",f.generateID())),M.editor_atto.widgets[n]=n;var l=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),c=0,h={};for(c=0;c<s.length;c++)h=s[c],l.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+c+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+c)+'">'+h.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+c]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+c),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+c),M.editor_atto.buttonhandlers[n+"_action_"+c]=h.handler);M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=!0);var p=new M.core.dialogue({bodyContent:l,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,centered:!1,align:{node:f,points:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]}});M.editor_atto.menus[n+"_"+t]=p,p.render(),p.hide(),p.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s){var o=e.one("#"+t+"_toolbar"),u=e.one("#"+t+"_toolbar .atto_group."+i+"_group"),a,f;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),a=e.Node.create('<button class="atto_'+n+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(n)+'">'+r+"</button>"),u.append(a),f=o.getAttribute("aria-activedescendant"),f||(a.setAttribute("tabindex","0"),o.setAttribute("aria-activedescendant",a.generateID())),M.editor_atto.buttonhandlers[n]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_button"),M.editor_atto.buttonhandlers[n]=s),M.editor_atto.widgets[n]=n},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&(n=n.pop());var r=null;return n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer),r&&r.ancestor("#"+t+"editable")!==null},focus:function(t){e.one("#"+t+"editable").focus()},init:function(t){var n=e.one("#"+t.elementid),r=e.Node.create('<div class="'+CSS.WRAPPER+'" />'),i=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'spellcheck="true" '+'class="'+CSS.CONTENT+'" />'),s="",o=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar"/>'),u=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />');u.appendChild(i),r.appendChild(o),r.appendChild(u);var a=e.io(t.content_css,{sync:!0}),f=a.responseText.indexOf("font:");f&&(s=a.responseText.substring(f+"font:".length,a.responseText.length-1),i.setStyle("font",s)),i.setStyle("minHeight",1.2*n.getAttribute("rows")+"em"),i.append(n.get("value")),n.get("parentNode").insert(r,n),i.setStyle("color",n.getStyle("color")),i.setStyle("lineHeight",n.getStyle("lineHeight")),i.setStyle("fontSize",n.getStyle("fontSize")),n.hide(),i.on("blur",function(){n.set("value",this.get_clean_html(t.elementid))},this),e.one(e.config.doc.body).delegate("key",this.keyboard_navigation,"down:37,39","#"+t.elementid+"_toolbar",this,t.elementid),M.editor_atto.filepickeroptions[t.elementid]=t.filepickeroptions},text_updated:function(t){var n=e.one("#"+t);n.set("value",this.get_clean_html(t))},get_clean_html:function(t){var n=e.one("#"+t+"editable");return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o;t.preventDefault(),r=e.all("#"+n+"_toolbar button"),s=e.one("#"+n+"_toolbar").getAttribute("aria-activedescendant");if(!s)return;i=e.one("#"+s),i.setAttribute("tabindex","-1"),o=r.indexOf(i),t.keyCode===37?(o--,o<0&&(o=r.size()-1)):(o++,o>=r.size()&&(o=0)),i=r.item(o),i.setAttribute("tabindex","0"),i.focus(),e.one("#"+n+"_toolbar").setAttribute("aria-activedescendant",i.generateID())},show_filepicker:function(t,n,r){e.use("core_filepicker",function(
+e){var i=M.editor_atto.filepickeroptions[t][n];i.formcallback=r,i.editor_target=e.one(t),M.core_filepicker.show(e,i)})},get_selection_from_node:function(e){var t;return window.getSelection?(t=document.createRange(),t.setStartBefore(e.getDOMNode()),t.setEndAfter(e.getDOMNode()),[t]):document.selection?(t=document.body.createTextRange(),t.moveToElementText(e.getDOMNode()),t):!1},get_selection:function(){if(window.getSelection){var e=window.getSelection(),t=[],n=0;for(n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t}return document.selection&&document.selection.createRange?document.selection.createRange():!1},selection_contains_node:function(e){var t,n;if(window.getSelection){n=window.getSelection();if(n.containsNode)return n.containsNode(e.getDOMNode(),!0)}return n=document.selection.createRange(),t=n.duplicate(),t.moveToElementText(e.getDOMNode()),n.inRange(t)},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();if(e.length>0)return e[0].commonAncestorContainer},get_selection_text:function(){var e=M.editor_atto.get_selection();if(e.length>0&&e[0].cloneContents)return e[0].cloneContents()},set_selection:function(e){var t,n;if(window.getSelection){t=window.getSelection(),t.removeAllRanges();for(n=0;n<e.length;n++)t.addRange(e[n])}else document.selection&&e.select&&e.select()}}},"@VERSION@",{requires:["node","io","overlay","escape","event-key","moodle-core-notification"]});
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index 966612f4ca1..eb566d6dcb2 100644
--- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
+++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
@@ -384,6 +384,16 @@ M.editor_atto = M.editor_atto || {
         M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
     },
 
+    /**
+     * The text in the contenteditable region has been updated,
+     * clean and copy the buffer to the text area.
+     * @param string elementid - the id of the textarea we created this editor from.
+     */
+    text_updated : function(elementid) {
+        var textarea = Y.one('#' + elementid);
+        textarea.set('value', this.get_clean_html(elementid));
+    },
+
     /**
      * Remove all YUI ids from the generated HTML.
      * @param string elementid - the id of the textarea we created this editor from.
diff --git a/lib/editor/atto/yui/src/editor/js/editor.js b/lib/editor/atto/yui/src/editor/js/editor.js
index 7f92c853bc6..1038280c713 100644
--- a/lib/editor/atto/yui/src/editor/js/editor.js
+++ b/lib/editor/atto/yui/src/editor/js/editor.js
@@ -382,6 +382,16 @@ M.editor_atto = M.editor_atto || {
         M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
     },
 
+    /**
+     * The text in the contenteditable region has been updated,
+     * clean and copy the buffer to the text area.
+     * @param string elementid - the id of the textarea we created this editor from.
+     */
+    text_updated : function(elementid) {
+        var textarea = Y.one('#' + elementid);
+        textarea.set('value', this.get_clean_html(elementid));
+    },
+
     /**
      * Remove all YUI ids from the generated HTML.
      * @param string elementid - the id of the textarea we created this editor from.