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 92c12f49a11..d9d39e0a505 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
@@ -200,49 +200,55 @@ M.atto_image = M.atto_image || {
         }
     },
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
-                             '<br/>' +
-                             '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_image') +
-                             '</button>' +
-                             '<br/>' +
-                             '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
-                             M.util.get_string('presentationoraltrequired', 'atto_image') +
-                             '</div>' +
-                             '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_image_presentation"/>' +
-                             '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
-                             '</label>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
-                             '<br/>' +
-                             '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
-                             '</label>' +
-                             '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_image_urlentrysubmit">' +
-                             M.util.get_string('createimage', 'atto_image') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
+                   '<br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_image') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
+                M.util.get_string('presentationoraltrequired', 'atto_image') +
+                '</div>' +
+                '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
+                '</label>' +
+                '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
+                '<br/>' +
+                '<input type="checkbox" id="atto_image_presentation"/>' +
+                '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
+                '</label>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
+                '<br/>' +
+                '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
+                '</label>' +
+                '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_image_urlentrysubmit">' +
+                M.util.get_string('createimage', 'atto_image') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_image_urlentry').on('blur', M.atto_image.url_changed, this);
         content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
-        content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            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 dc2ba5e65ae..94dc66a2c5e 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,2 @@
-YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s<i.childNodes.length;s++){var u=i.childNodes[0];o.length===0&&(u.nodeName.toLowerCase()==="img"?o[0]=u:u.getElementsByTagName&&(o=u.getElementsByTagName("img")))}if(o.length>0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"));var c=a.get("role");c==="presentation"&&e.one("#atto_image_presentation").set("checked","checked")}r.show()}},r=M.util.image_url("e/insert_edit_image","core");M.editor_atto.add_toolbar_button(t.elementid,"image",r,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},url_changed:function(){var t=e.one("#atto_image_urlentry");if(t.get("value")!==""){var n=new Image;n.onload=function(){var t;t=e.one("#atto_image_widthentry"),t.get("value")===""&&t.set("value",this.width),t=e.one("#atto_image_heightentry"),t.get("value")===""&&t.set("value",this.height),t=e.one("#atto_image_preview"),t.set("src",this.src),t.setStyle("display","inline")},n.src=t.get("value")}},set_image:function(t,n){var r=t.currentTarget.ancestor(".atto_form").one("#atto_image_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry");var s=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_widthentry");var o=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_heightentry");var u=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation");var a=r.get("checked"),f;t.preventDefault();if(s===""&&!a){f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","block"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!0),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!0);return}f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","none"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!1),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!1),M.atto_image.dialogue.hide();if(i!==""){M.editor_atto.set_selection(M.atto_image.selection);var l='<img src="'+e.Escape.html(i)+'" alt="'+e.Escape.html(s)+'"';o&&(l+=' width="'+e.Escape.html(o)+'"'),u&&(l+=' height="'+e.Escape.html(u)+'"'),a&&(l+=' role="presentation"'),l+="/>",document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(l):document.execCommand("insertHTML",!1,l),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>'+"<br/>"+'<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<br/>"+'<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">'+M.util.get_string("presentationoraltrequired","atto_image")+"</div>"+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>'+"<br/>"+'<input type="checkbox" id="atto_image_presentation"/>'+'<label class="sameline" for="atto_image_presentation">'+M.util.get_string("presentation","atto_image")+"</label>"+"<br/>"+'<label class="sameline" for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label class="sameline" for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+"<br/>"+'<label for="atto_image_preview">'+M.util.get_string("preview","atto_image")+"</label>"+'<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_image_urlentrysubmit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image"));return n.one("#atto_image_urlentry").on("blur",M.atto_image.url_changed,this),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"]});
+YUI.add("moodle-atto_image-button",function(e,t){M.atto_image=M.atto_image||{dialogue:null,selection:null,init:function(t){var n=function(t,n){t.preventDefault(),M.editor_atto.is_active(n)||M.editor_atto.focus(n),M.atto_image.selection=M.editor_atto.get_selection();if(M.atto_image.selection!==!1){var r;M.atto_image.dialogue?r=M.atto_image.dialogue:r=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),r.set("bodyContent",M.atto_image.get_form_content(n)),r.set("headerContent",M.util.get_string("createimage","atto_image")),r.render(),r.centerDialogue(),M.atto_image.dialogue=r;var i=M.editor_atto.get_selection_text(),s=0,o=[];for(s=0;s<i.childNodes.length;s++){var u=i.childNodes[0];o.length===0&&(u.nodeName.toLowerCase()==="img"?o[0]=u:u.getElementsByTagName&&(o=u.getElementsByTagName("img")))}if(o.length>0){var a=e.one(o[0]),f=a.getAttribute("width"),l=a.getAttribute("height");f>0&&e.one("#atto_image_widthentry").set("value",f),l>0&&e.one("#atto_image_heightentry").set("value",l),e.one("#atto_image_preview").set("src",a.get("src")),e.one("#atto_image_preview").setStyle("display","inline"),e.one("#atto_image_altentry").set("value",a.get("alt")),e.one("#atto_image_urlentry").set("value",a.get("src"));var c=a.get("role");c==="presentation"&&e.one("#atto_image_presentation").set("checked","checked")}r.show()}},r=M.util.image_url("e/insert_edit_image","core");M.editor_atto.add_toolbar_button(t.elementid,"image",r,t.group,n,this)},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"image",M.atto_image.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_image_urlentry");n.set("value",t.url);var r=new Image;r.onload=function(){e.one("#atto_image_widthentry").set("value",this.width),e.one("#atto_image_heightentry").set("value",this.height),e.one("#atto_image_preview").set("src",this.src),e.one("#atto_image_preview").setStyle("display","inline")},r.src=t.url}},url_changed:function(){var t=e.one("#atto_image_urlentry");if(t.get("value")!==""){var n=new Image;n.onload=function(){var t;t=e.one("#atto_image_widthentry"),t.get("value")===""&&t.set("value",this.width),t=e.one("#atto_image_heightentry"),t.get("value")===""&&t.set("value",this.height),t=e.one("#atto_image_preview"),t.set("src",this.src),t.setStyle("display","inline")},n.src=t.get("value")}},set_image:function(t,n){var r=t.currentTarget.ancestor(".atto_form").one("#atto_image_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry");var s=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_widthentry");var o=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_heightentry");var u=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation");var a=r.get("checked"),f;t.preventDefault();if(s===""&&!a){f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","block"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!0),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!0);return}f=t.currentTarget.ancestor(".atto_form").one("#atto_image_altwarning"),f.setStyle("display","none"),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_altentry"),r.setAttribute("aria-invalid",!1),r=t.currentTarget.ancestor(".atto_form").one("#atto_image_presentation"),r.setAttribute("aria-invalid",!1),M.atto_image.dialogue.hide();if(i!==""){M.editor_atto.set_selection(M.atto_image.selection);var l='<img src="'+e.Escape.html(i)+'" alt="'+e.Escape.html(s)+'"';o&&(l+=' width="'+e.Escape.html(o)+'"'),u&&(l+=' height="'+e.Escape.html(u)+'"'),a&&(l+=' role="presentation"'),l+="/>",document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(l):document.execCommand("insertHTML",!1,l),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_image_urlentry">'+M.util.get_string("enterurl","atto_image")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>'+"<br/>";M.editor_atto.can_show_filepicker(t,"image")&&(n+='<button id="openimagebrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_image")+"</button>"+"<br/>"),n+='<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">'+M.util.get_string("presentationoraltrequired","atto_image")+"</div>"+'<label for="atto_image_altentry">'+M.util.get_string("enteralt","atto_image")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>'+"<br/>"+'<input type="checkbox" id="atto_image_presentation"/>'+'<label class="sameline" for="atto_image_presentation">'+M.util.get_string("presentation","atto_image")+"</label>"+"<br/>"+'<label class="sameline" for="atto_image_widthentry">'+M.util.get_string("width","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_widthentry" size="10"/>'+"<br/>"+'<label class="sameline" for="atto_image_heightentry">'+M.util.get_string("height","atto_image")+"</label>"+'<input type="text" value="" id="atto_image_heightentry" size="10"/>'+"<br/>"+'<label for="atto_image_preview">'+M.util.get_string("preview","atto_image")+"</label>"+'<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_image_urlentrysubmit">'+M.util.get_string("createimage","atto_image")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_image");var r=e.Node.create(n);return r.one("#atto_image_urlentry").on("blur",M.atto_image.url_changed,this),r.one("#atto_image_urlentrysubmit").on("click",M.atto_image.set_image,this,t),M.editor_atto.can_show_filepicker(t,"image")&&r.one("#openimagebrowser").on("click",M.atto_image.open_filepicker),
+r}}},"@VERSION@",{requires:["node","escape"]});
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 92c12f49a11..d9d39e0a505 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
@@ -200,49 +200,55 @@ M.atto_image = M.atto_image || {
         }
     },
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
-                             '<br/>' +
-                             '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_image') +
-                             '</button>' +
-                             '<br/>' +
-                             '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
-                             M.util.get_string('presentationoraltrequired', 'atto_image') +
-                             '</div>' +
-                             '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_image_presentation"/>' +
-                             '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
-                             '</label>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
-                             '<br/>' +
-                             '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
-                             '</label>' +
-                             '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_image_urlentrysubmit">' +
-                             M.util.get_string('createimage', 'atto_image') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
+                   '<br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_image') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
+                M.util.get_string('presentationoraltrequired', 'atto_image') +
+                '</div>' +
+                '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
+                '</label>' +
+                '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
+                '<br/>' +
+                '<input type="checkbox" id="atto_image_presentation"/>' +
+                '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
+                '</label>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
+                '<br/>' +
+                '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
+                '</label>' +
+                '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_image_urlentrysubmit">' +
+                M.util.get_string('createimage', 'atto_image') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_image_urlentry').on('blur', M.atto_image.url_changed, this);
         content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
-        content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            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 83840d65b8b..66c5c55cb83 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
@@ -198,49 +198,55 @@ M.atto_image = M.atto_image || {
         }
     },
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
-                             '<br/>' +
-                             '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_image') +
-                             '</button>' +
-                             '<br/>' +
-                             '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
-                             M.util.get_string('presentationoraltrequired', 'atto_image') +
-                             '</div>' +
-                             '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
-                             '</label>' +
-                             '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_image_presentation"/>' +
-                             '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
-                             '</label>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
-                             '<br/>' +
-                             '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
-                             '</label>' +
-                             '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
-                             '<br/>' +
-                             '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
-                             '</label>' +
-                             '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_image_urlentrysubmit">' +
-                             M.util.get_string('createimage', 'atto_image') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_image_urlentry">' + M.util.get_string('enterurl', 'atto_image') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_image_urlentry" size="32"/>' +
+                   '<br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            html += '<button id="openimagebrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_image') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<div style="display:none" role="alert" id="atto_image_altwarning" class="warning">' +
+                M.util.get_string('presentationoraltrequired', 'atto_image') +
+                '</div>' +
+                '<label for="atto_image_altentry">' + M.util.get_string('enteralt', 'atto_image') +
+                '</label>' +
+                '<input class="fullwidth" type="text" value="" id="atto_image_altentry" size="32"/>' +
+                '<br/>' +
+                '<input type="checkbox" id="atto_image_presentation"/>' +
+                '<label class="sameline" for="atto_image_presentation">' + M.util.get_string('presentation', 'atto_image') +
+                '</label>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_widthentry">' + M.util.get_string('width', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_widthentry" size="10"/>' +
+                '<br/>' +
+                '<label class="sameline" for="atto_image_heightentry">' + M.util.get_string('height', 'atto_image') +
+                '</label>' +
+                '<input type="text" value="" id="atto_image_heightentry" size="10"/>' +
+                '<br/>' +
+                '<label for="atto_image_preview">' + M.util.get_string('preview', 'atto_image') +
+                '</label>' +
+                '<img src="#" width="200" id="atto_image_preview" alt="" style="display: none;"/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_image_urlentrysubmit">' +
+                M.util.get_string('createimage', 'atto_image') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_image');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_image_urlentry').on('blur', M.atto_image.url_changed, this);
         content.one('#atto_image_urlentrysubmit').on('click', M.atto_image.set_image, this, elementid);
-        content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'image')) {
+            content.one('#openimagebrowser').on('click', M.atto_image.open_filepicker);
+        }
         return content;
     }
 };
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 ce89f7bd1c1..253db5a530c 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
@@ -238,29 +238,35 @@ M.atto_link = M.atto_link || {
      * @return string
      */
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>' +
-                             '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_link') +
-                             '</button>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
-                             '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
-                             '</label>' +
-                             '<br/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_link_urlentrysubmit">' +
-                             M.util.get_string('createlink', 'atto_link') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_link') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
+                '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
+                '</label>' +
+                '<br/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_link_urlentrysubmit">' +
+                M.util.get_string('createlink', 'atto_link') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
-        content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            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 cb6dbd6e6fa..b2b4af91168 100644
--- a/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
+++ b/lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,display_chooser:function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}},init:function(e){var t=M.util.image_url("e/insert_edit_link","core");M.editor_atto.add_toolbar_button(e.elementid,"link",t,e.group,this.display_chooser,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r,i;if(!t)return;n=M.atto_link.find_selected_anchors(e.one(t)),n.length>0&&(r=n[0],M.atto_link.selection=M.editor_atto.get_selection_from_node(r),i=r.getAttribute("href"),target=r.getAttribute("target"),i!==""&&e.one("#atto_link_urlentry").set("value",i),target==="_blank"?e.one("#atto_link_openinnewwindow").set("checked","checked"):e.one("#atto_link_openinnewwindow").set("checked",""))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(t,n){var r,i,s,o,u;t.preventDefault(),M.atto_link.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("input[type=url]"),u=r.get("value");if(u!==""){M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,u),s=M.editor_atto.get_selection_parent_node();if(!s)return;o=M.atto_link.find_selected_anchors(e.one(s)),e.Array.each(o,function(e){i=t.currentTarget.ancestor(".atto_form").one("input[type=checkbox]"),i.get("checked")?e.setAttribute("target","_blank"):e.removeAttribute("target")}),M.editor_atto.text_updated(n)}},find_selected_anchors:function(e){var t=e.get("tagName"),n,r;return t&&t.toLowerCase()==="a"?[e]:(r=[],e.all("a").each(function(e){!n&&M.editor_atto.selection_contains_node(e)&&r.push(e)}),r.length>0?r:(n=e.ancestor("a"),n?[n]:[]))},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>'+'<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<br/>"+'<input type="checkbox" id="atto_link_openinnewwindow"/>'+'<label class="sameline" for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label>"+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link"));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"]});
+YUI.add("moodle-atto_link-button",function(e,t){M.atto_link=M.atto_link||{dialogue:null,selection:null,display_chooser:function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_link.selection=M.editor_atto.get_selection();if(M.atto_link.selection!==!1&&!M.atto_link.selection.collapsed){var n;M.atto_link.dialogue?n=M.atto_link.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_link.get_form_content(t)),n.set("headerContent",M.util.get_string("createlink","atto_link")),M.atto_link.resolve_anchors(),n.show(),M.atto_link.dialogue=n}},init:function(e){var t=M.util.image_url("e/insert_edit_link","core");M.editor_atto.add_toolbar_button(e.elementid,"link",t,e.group,this.display_chooser,this)},resolve_anchors:function(){var t=M.editor_atto.get_selection_parent_node(),n,r,i;if(!t)return;n=M.atto_link.find_selected_anchors(e.one(t)),n.length>0&&(r=n[0],M.atto_link.selection=M.editor_atto.get_selection_from_node(r),i=r.getAttribute("href"),target=r.getAttribute("target"),i!==""&&e.one("#atto_link_urlentry").set("value",i),target==="_blank"?e.one("#atto_link_openinnewwindow").set("checked","checked"):e.one("#atto_link_openinnewwindow").set("checked",""))},open_filepicker:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"link",M.atto_link.filepicker_callback)},filepicker_callback:function(e){M.atto_link.dialogue.hide(),e.url!==""&&(M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,e.url))},set_link:function(t,n){var r,i,s,o,u;t.preventDefault(),M.atto_link.dialogue.hide(),r=t.currentTarget.ancestor(".atto_form").one("input[type=url]"),u=r.get("value");if(u!==""){M.editor_atto.set_selection(M.atto_link.selection),document.execCommand("unlink",!1,null),document.execCommand("createLink",!1,u),s=M.editor_atto.get_selection_parent_node();if(!s)return;o=M.atto_link.find_selected_anchors(e.one(s)),e.Array.each(o,function(e){i=t.currentTarget.ancestor(".atto_form").one("input[type=checkbox]"),i.get("checked")?e.setAttribute("target","_blank"):e.removeAttribute("target")}),M.editor_atto.text_updated(n)}},find_selected_anchors:function(e){var t=e.get("tagName"),n,r;return t&&t.toLowerCase()==="a"?[e]:(r=[],e.all("a").each(function(e){!n&&M.editor_atto.selection_contains_node(e)&&r.push(e)}),r.length>0?r:(n=e.ancestor("a"),n?[n]:[]))},get_form_content:function(t){var n='<form class="atto_form"><label for="atto_link_urlentry">'+M.util.get_string("enterurl","atto_link")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';M.editor_atto.can_show_filepicker(t,"link")&&(n+='<button id="openlinkbrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_link")+"</button>"+"<br/>"),n+='<input type="checkbox" id="atto_link_openinnewwindow"/><label class="sameline" for="atto_link_openinnewwindow">'+M.util.get_string("openinnewwindow","atto_link")+"</label>"+"<br/>"+'<div class="mdl-align">'+"<br/>"+'<button id="atto_link_urlentrysubmit">'+M.util.get_string("createlink","atto_link")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_link");var r=e.Node.create(n);return r.one("#atto_link_urlentrysubmit").on("click",M.atto_link.set_link,this,t),M.editor_atto.can_show_filepicker(t,"link")&&r.one("#openlinkbrowser").on("click",M.atto_link.open_filepicker),r}}},"@VERSION@",{requires:["node","escape"]});
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 ce89f7bd1c1..253db5a530c 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
@@ -238,29 +238,35 @@ M.atto_link = M.atto_link || {
      * @return string
      */
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>' +
-                             '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_link') +
-                             '</button>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
-                             '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
-                             '</label>' +
-                             '<br/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_link_urlentrysubmit">' +
-                             M.util.get_string('createlink', 'atto_link') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_link') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
+                '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
+                '</label>' +
+                '<br/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_link_urlentrysubmit">' +
+                M.util.get_string('createlink', 'atto_link') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
-        content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            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 85a96c05b85..1bd20182c1f 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
@@ -236,29 +236,35 @@ M.atto_link = M.atto_link || {
      * @return string
      */
     get_form_content : function(elementid) {
-        var content = Y.Node.create('<form class="atto_form">' +
-                             '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
-                             '</label>' +
-                             '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>' +
-                             '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
-                             M.util.get_string('browserepositories', 'atto_link') +
-                             '</button>' +
-                             '<br/>' +
-                             '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
-                             '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
-                             '</label>' +
-                             '<br/>' +
-                             '<div class="mdl-align">' +
-                             '<br/>' +
-                             '<button id="atto_link_urlentrysubmit">' +
-                             M.util.get_string('createlink', 'atto_link') +
-                             '</button>' +
-                             '</div>' +
-                             '</form>' +
-                             '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link'));
+        var html = '<form class="atto_form">' +
+                   '<label for="atto_link_urlentry">' + M.util.get_string('enterurl', 'atto_link') +
+                   '</label>' +
+                   '<input class="fullwidth" type="url" value="" id="atto_link_urlentry" size="32"/><br/>';
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            html += '<button id="openlinkbrowser" data-editor="' + Y.Escape.html(elementid) + '">' +
+                    M.util.get_string('browserepositories', 'atto_link') +
+                    '</button>' +
+                    '<br/>';
+        }
+        html += '<input type="checkbox" id="atto_link_openinnewwindow"/>' +
+                '<label class="sameline" for="atto_link_openinnewwindow">' + M.util.get_string('openinnewwindow', 'atto_link') +
+                '</label>' +
+                '<br/>' +
+                '<div class="mdl-align">' +
+                '<br/>' +
+                '<button id="atto_link_urlentrysubmit">' +
+                M.util.get_string('createlink', 'atto_link') +
+                '</button>' +
+                '</div>' +
+                '</form>' +
+                '<hr/>' + M.util.get_string('accessibilityhint', 'atto_link');
+
+        var content = Y.Node.create(html);
 
         content.one('#atto_link_urlentrysubmit').on('click', M.atto_link.set_link, this, elementid);
-        content.one('#openlinkbrowser').on('click', M.atto_link.open_filepicker);
+        if (M.editor_atto.can_show_filepicker(elementid, 'link')) {
+            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 e5587493c06..8bda5eacac3 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
@@ -26,6 +26,11 @@ M.atto_media = M.atto_media || {
     dialogue : null,
     selection : null,
     init : function(params) {
+
+        if (!M.editor_atto.can_show_filepicker(params.elementid, 'media')) {
+            // Do not show this button if we can't browse repositories.
+            return;
+        }
         var display_chooser = function(e, elementid) {
             e.preventDefault();
             if (!M.editor_atto.is_active(elementid)) {
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 9571db3c8c0..3a246f7aa84 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}},n=M.util.image_url("e/insert_edit_video","core");M.editor_atto.add_toolbar_button(e.elementid,"media",n,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t,n){t.preventDefault(),M.atto_media.dialogue.hide();var r=t.currentTarget.ancestor(".atto_form").one("#atto_media_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_media_nameentry");var s=r.get("value");if(i!==""&&s!==""){M.editor_atto.set_selection(M.atto_media.selection);var o='<a href="'+e.Escape.html(i)+'">'+s+"</a>";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(o):document.execCommand("insertHTML",!1,o),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_media_urlentry">'+M.util.get_string("enterurl","atto_media")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>'+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_media")+"</button>"+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_media_urlentrysubmit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media,this,t),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]});
+YUI.add("moodle-atto_media-button",function(e,t){M.atto_media=M.atto_media||{dialogue:null,selection:null,init:function(e){if(!M.editor_atto.can_show_filepicker(e.elementid,"media"))return;var t=function(e,t){e.preventDefault(),M.editor_atto.is_active(t)||M.editor_atto.focus(t),M.atto_media.selection=M.editor_atto.get_selection();if(M.atto_media.selection!==!1){var n;M.atto_media.dialogue?n=M.atto_media.dialogue:n=new M.core.dialogue({visible:!1,modal:!0,close:!0,draggable:!0}),n.render(),n.set("bodyContent",M.atto_media.get_form_content(t)),n.set("headerContent",M.util.get_string("createmedia","atto_media")),n.centerDialogue(),n.show(),M.atto_media.dialogue=n}},n=M.util.image_url("e/insert_edit_video","core");M.editor_atto.add_toolbar_button(e.elementid,"media",n,e.group,t,this)},open_browser:function(e){var t=this.getAttribute("data-editor");e.preventDefault(),M.editor_atto.show_filepicker(t,"media",M.atto_media.filepicker_callback)},filepicker_callback:function(t){if(t.url!==""){var n=e.one("#atto_media_urlentry");n.set("value",t.url),n=e.one("#atto_media_nameentry"),n.set("value",t.file)}},set_media:function(t,n){t.preventDefault(),M.atto_media.dialogue.hide();var r=t.currentTarget.ancestor(".atto_form").one("#atto_media_urlentry"),i=r.get("value");r=t.currentTarget.ancestor(".atto_form").one("#atto_media_nameentry");var s=r.get("value");if(i!==""&&s!==""){M.editor_atto.set_selection(M.atto_media.selection);var o='<a href="'+e.Escape.html(i)+'">'+s+"</a>";document.selection&&document.selection.createRange().pasteHTML?document.selection.createRange().pasteHTML(o):document.execCommand("insertHTML",!1,o),M.editor_atto.text_updated(n)}},get_form_content:function(t){var n=e.Node.create('<form class="atto_form"><label for="atto_media_urlentry">'+M.util.get_string("enterurl","atto_media")+"</label>"+'<input class="fullwidth" type="url" value="" id="atto_media_urlentry" size="32"/><br/>'+'<button id="openmediabrowser" data-editor="'+e.Escape.html(t)+'">'+M.util.get_string("browserepositories","atto_media")+"</button>"+'<label for="atto_media_nameentry">'+M.util.get_string("entername","atto_media")+"</label>"+'<input class="fullwidth" type="text" value="" id="atto_media_nameentry" size="32" required="true"/>'+'<div class="mdl-align">'+"<br/>"+'<button id="atto_media_urlentrysubmit">'+M.util.get_string("createmedia","atto_media")+"</button>"+"</div>"+"</form>"+"<hr/>"+M.util.get_string("accessibilityhint","atto_media"));return n.one("#atto_media_urlentrysubmit").on("click",M.atto_media.set_media,this,t),n.one("#openmediabrowser").on("click",M.atto_media.open_browser),n}}},"@VERSION@",{requires:["node","escape"]});
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 e5587493c06..8bda5eacac3 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
@@ -26,6 +26,11 @@ M.atto_media = M.atto_media || {
     dialogue : null,
     selection : null,
     init : function(params) {
+
+        if (!M.editor_atto.can_show_filepicker(params.elementid, 'media')) {
+            // Do not show this button if we can't browse repositories.
+            return;
+        }
         var display_chooser = function(e, elementid) {
             e.preventDefault();
             if (!M.editor_atto.is_active(elementid)) {
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 4b5c3bc3e36..1a108a5eb90 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
@@ -24,6 +24,11 @@ M.atto_media = M.atto_media || {
     dialogue : null,
     selection : null,
     init : function(params) {
+
+        if (!M.editor_atto.can_show_filepicker(params.elementid, 'media')) {
+            // Do not show this button if we can't browse repositories.
+            return;
+        }
         var display_chooser = function(e, elementid) {
             e.preventDefault();
             if (!M.editor_atto.is_active(elementid)) {
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 9f825f3800b..b57dbf19741 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
@@ -355,7 +355,6 @@ M.editor_atto = M.editor_atto || {
      * @param object params for this editor instance.
      */
     init : function(params) {
-        var textarea = Y.one('#' +params.elementid);
         var wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
         var atto = Y.Node.create('<div id="' + params.elementid + 'editable" ' +
                                             'contenteditable="true" ' +
@@ -367,6 +366,9 @@ M.editor_atto = M.editor_atto || {
 
         // Editable content wrapper.
         var content = Y.Node.create('<div class="' + CSS.CONTENTWRAPPER + '" />');
+        var elementid = params.elementid.replace(':', '\\:');
+        var textarea = Y.one('#' +elementid);
+
         content.appendChild(atto);
 
         // Add everything to the wrapper.
@@ -395,19 +397,19 @@ M.editor_atto = M.editor_atto || {
 
         // Copy the current value back to the textarea when focus leaves us.
         atto.on('blur', function() {
-            this.text_updated(params.elementid);
+            this.text_updated(elementid);
         }, this);
 
         // Listen for Arrow left and Arrow right keys.
         Y.one(Y.config.doc.body).delegate('key',
                                           this.keyboard_navigation,
                                           'down:37,39',
-                                          '#' + params.elementid + '_toolbar',
+                                          '#' + elementid + '_toolbar',
                                           this,
-                                          params.elementid);
+                                          elementid);
 
         // Save the file picker options for later.
-        M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
+        M.editor_atto.filepickeroptions[elementid] = params.filepickeroptions;
 
         // Init each of the plugins
         var i, j;
@@ -415,7 +417,7 @@ M.editor_atto = M.editor_atto || {
             var group = params.plugins[i].group;
             for (j = 0; j < params.plugins[i].plugins.length; j++) {
                 var plugin = params.plugins[i].plugins[j];
-                plugin.params.elementid = params.elementid;
+                plugin.params.elementid = elementid;
                 plugin.params.group = group;
 
                 M['atto_' + plugin.name].init(plugin.params);
@@ -507,6 +509,18 @@ M.editor_atto = M.editor_atto || {
         Y.one('#' + elementid + '_toolbar').setAttribute('aria-activedescendant', current.generateID());
     },
 
+    /**
+     * Should we show the filepicker for this filetype?
+     *
+     * @param string elementid for this editor instance.
+     * @param string type The media type for the file picker
+     * @return boolean
+     */
+    can_show_filepicker : function(elementid, type) {
+        var options = M.editor_atto.filepickeroptions[elementid];
+        return ((typeof options[type]) !== "undefined");
+    },
+
     /**
      * Show the filepicker.
      * @param string elementid for this editor instance.
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 c3007820608..d4bc57078fa 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:{},textupdatedhandlers:{},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_text_updated_handler:function(e,t){e in M.editor_atto.textupdatedhandlers||(M.editor_atto.textupdatedhandlers[e]=[]),M.editor_atto.textupdatedhandlers[e].push(t)},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,l;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),l=M.util.image_url("t/expanded","moodle"),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+l+'"/>'+"</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 c=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),h=0,p={};for(h=0;h<s.length;h++)p=s[h],c.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+h+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+h)+'">'+p.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+h]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+h),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+h),M.editor_atto.buttonhandlers[n+"_action_"+h]=p.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 d=new M.core.dialogue({bodyContent:c,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,center:!1});M.editor_atto.menus[n+"_"+t]=d,d.render(),d.align(f,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),d.hide(),d.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)+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+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(){this.text_updated(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;var l,c;for(l=0;l<t.plugins.length;l++){var h=t.plugins[l].group;for(c=0;c<t.plugins[l].plugins.length;c++){var p=t.plugins
-[l].plugins[c];p.params.elementid=t.elementid,p.params.group=h,M["atto_"+p.name].init(p.params)}}},text_updated:function(t){var n=e.one("#"+t),r=this.get_clean_html(t);n.set("value",r);var i=0;if(t in M.editor_atto.textupdatedhandlers)for(i=0;i<M.editor_atto.textupdatedhandlers[t].length;i++){var s=M.editor_atto.textupdatedhandlers[t][i];s(t)}},get_clean_html:function(t){var n=e.one("#"+t+"editable").cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),e.each(n.all(".atto_control"),function(e){e.remove(!0)}),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()}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",r.superclass.constructor.apply(this,[e])},e.extend(r,M.core.dialogue,{initializer:function(t){var n,i,s;r.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("editor_atto_controlmenu"),n=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),n.prepend(i),n.on("clickoutside",function(e){this.get("visible")&&(e.target.ancestor(".atto_control")||(e.preventDefault(),this.hide()))},this)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r},"@VERSION@",{requires:["node","io","overlay","escape","event","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:{},textupdatedhandlers:{},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_text_updated_handler:function(e,t){e in M.editor_atto.textupdatedhandlers||(M.editor_atto.textupdatedhandlers[e]=[]),M.editor_atto.textupdatedhandlers[e].push(t)},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,l;u||(u=e.Node.create('<div class="atto_group '+i+'_group"></div>'),o.append(u)),l=M.util.image_url("t/expanded","moodle"),f=e.Node.create('<button class="atto_'+n+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'data-menu="'+n+"_"+t+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+l+'"/>'+"</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 c=e.Node.create('<div class="atto_'+n+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"></div>'),h=0,p={};for(h=0;h<s.length;h++)p=s[h],c.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+n+"_action_"+h+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-handler="'+e.Escape.html(n+"_action_"+h)+'">'+p.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+h]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+n+"_action_"+h),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"space,enter",".atto_"+n+"_action_"+h),M.editor_atto.buttonhandlers[n+"_action_"+h]=p.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 d=new M.core.dialogue({bodyContent:c,visible:!1,width:"14em",zindex:100,lightbox:!1,closeButton:!1,center:!1});M.editor_atto.menus[n+"_"+t]=d,d.render(),d.align(f,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),d.hide(),d.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)+'" '+'title="'+e.Escape.html(M.util.get_string("pluginname","atto_"+n))+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+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.Node.create('<div class="'+CSS.WRAPPER+'" />'),r=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'spellcheck="true" '+'class="'+CSS.CONTENT+'" />'),i="",s=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar"/>'),o=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />'),u=t.elementid.replace(":","\\:"),a=e.one("#"+u);o.appendChild(r),n.appendChild(s),n.appendChild(o);var f=e.io(t.content_css,{sync:!0}),l=f.responseText.indexOf("font:");l&&(i=f.responseText.substring(l+"font:".length,f.responseText.length-1),r.setStyle("font",i)),r.setStyle("minHeight",1.2*a.getAttribute("rows")+"em"),r.append(a.get("value")),a.get("parentNode").insert(n,a),r.setStyle("color",a.getStyle("color")),r.setStyle("lineHeight",a.getStyle("lineHeight")),r.setStyle("fontSize",a.getStyle("fontSize")),a.hide(),r.on("blur",function(){this.text_updated(u)},this),e.one(e.config.doc.body).delegate("key",this.keyboard_navigation,"down:37,39","#"+u+"_toolbar",this,u),M.editor_atto.filepickeroptions[u]=t.filepickeroptions;var c,h;for(c=0;c<t.plugins.length;c++){var p=t.plugins[c].group;for(h=0;h<t.plugins[c].plugins.length;h++){var d=t.plugins[c].plugins[h]
+;d.params.elementid=u,d.params.group=p,M["atto_"+d.name].init(d.params)}}},text_updated:function(t){var n=e.one("#"+t),r=this.get_clean_html(t);n.set("value",r);var i=0;if(t in M.editor_atto.textupdatedhandlers)for(i=0;i<M.editor_atto.textupdatedhandlers[t].length;i++){var s=M.editor_atto.textupdatedhandlers[t][i];s(t)}},get_clean_html:function(t){var n=e.one("#"+t+"editable").cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),e.each(n.all(".atto_control"),function(e){e.remove(!0)}),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())},can_show_filepicker:function(e,t){var n=M.editor_atto.filepickeroptions[e];return typeof n[t]!="undefined"},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()}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",r.superclass.constructor.apply(this,[e])},e.extend(r,M.core.dialogue,{initializer:function(t){var n,i,s;r.superclass.initializer.call(this,t),s=this.get("boundingBox"),s.addClass("editor_atto_controlmenu"),n=this.bodyNode,i=e.Node.create("<h3/>"),i.addClass("accesshide"),i.setHTML(this.get("headerText")),n.prepend(i),n.on("clickoutside",function(e){this.get("visible")&&(e.target.ancestor(".atto_control")||(e.preventDefault(),this.hide()))},this)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r},"@VERSION@",{requires:["node","io","overlay","escape","event","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 9f825f3800b..b57dbf19741 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
@@ -355,7 +355,6 @@ M.editor_atto = M.editor_atto || {
      * @param object params for this editor instance.
      */
     init : function(params) {
-        var textarea = Y.one('#' +params.elementid);
         var wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
         var atto = Y.Node.create('<div id="' + params.elementid + 'editable" ' +
                                             'contenteditable="true" ' +
@@ -367,6 +366,9 @@ M.editor_atto = M.editor_atto || {
 
         // Editable content wrapper.
         var content = Y.Node.create('<div class="' + CSS.CONTENTWRAPPER + '" />');
+        var elementid = params.elementid.replace(':', '\\:');
+        var textarea = Y.one('#' +elementid);
+
         content.appendChild(atto);
 
         // Add everything to the wrapper.
@@ -395,19 +397,19 @@ M.editor_atto = M.editor_atto || {
 
         // Copy the current value back to the textarea when focus leaves us.
         atto.on('blur', function() {
-            this.text_updated(params.elementid);
+            this.text_updated(elementid);
         }, this);
 
         // Listen for Arrow left and Arrow right keys.
         Y.one(Y.config.doc.body).delegate('key',
                                           this.keyboard_navigation,
                                           'down:37,39',
-                                          '#' + params.elementid + '_toolbar',
+                                          '#' + elementid + '_toolbar',
                                           this,
-                                          params.elementid);
+                                          elementid);
 
         // Save the file picker options for later.
-        M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
+        M.editor_atto.filepickeroptions[elementid] = params.filepickeroptions;
 
         // Init each of the plugins
         var i, j;
@@ -415,7 +417,7 @@ M.editor_atto = M.editor_atto || {
             var group = params.plugins[i].group;
             for (j = 0; j < params.plugins[i].plugins.length; j++) {
                 var plugin = params.plugins[i].plugins[j];
-                plugin.params.elementid = params.elementid;
+                plugin.params.elementid = elementid;
                 plugin.params.group = group;
 
                 M['atto_' + plugin.name].init(plugin.params);
@@ -507,6 +509,18 @@ M.editor_atto = M.editor_atto || {
         Y.one('#' + elementid + '_toolbar').setAttribute('aria-activedescendant', current.generateID());
     },
 
+    /**
+     * Should we show the filepicker for this filetype?
+     *
+     * @param string elementid for this editor instance.
+     * @param string type The media type for the file picker
+     * @return boolean
+     */
+    can_show_filepicker : function(elementid, type) {
+        var options = M.editor_atto.filepickeroptions[elementid];
+        return ((typeof options[type]) !== "undefined");
+    },
+
     /**
      * Show the filepicker.
      * @param string elementid for this editor instance.
diff --git a/lib/editor/atto/yui/src/editor/js/editor.js b/lib/editor/atto/yui/src/editor/js/editor.js
index 97750443b36..6c6d8aef783 100644
--- a/lib/editor/atto/yui/src/editor/js/editor.js
+++ b/lib/editor/atto/yui/src/editor/js/editor.js
@@ -353,7 +353,6 @@ M.editor_atto = M.editor_atto || {
      * @param object params for this editor instance.
      */
     init : function(params) {
-        var textarea = Y.one('#' +params.elementid);
         var wrapper = Y.Node.create('<div class="' + CSS.WRAPPER + '" />');
         var atto = Y.Node.create('<div id="' + params.elementid + 'editable" ' +
                                             'contenteditable="true" ' +
@@ -365,6 +364,9 @@ M.editor_atto = M.editor_atto || {
 
         // Editable content wrapper.
         var content = Y.Node.create('<div class="' + CSS.CONTENTWRAPPER + '" />');
+        var elementid = params.elementid.replace(':', '\\:');
+        var textarea = Y.one('#' +elementid);
+
         content.appendChild(atto);
 
         // Add everything to the wrapper.
@@ -393,19 +395,19 @@ M.editor_atto = M.editor_atto || {
 
         // Copy the current value back to the textarea when focus leaves us.
         atto.on('blur', function() {
-            this.text_updated(params.elementid);
+            this.text_updated(elementid);
         }, this);
 
         // Listen for Arrow left and Arrow right keys.
         Y.one(Y.config.doc.body).delegate('key',
                                           this.keyboard_navigation,
                                           'down:37,39',
-                                          '#' + params.elementid + '_toolbar',
+                                          '#' + elementid + '_toolbar',
                                           this,
-                                          params.elementid);
+                                          elementid);
 
         // Save the file picker options for later.
-        M.editor_atto.filepickeroptions[params.elementid] = params.filepickeroptions;
+        M.editor_atto.filepickeroptions[elementid] = params.filepickeroptions;
 
         // Init each of the plugins
         var i, j;
@@ -413,7 +415,7 @@ M.editor_atto = M.editor_atto || {
             var group = params.plugins[i].group;
             for (j = 0; j < params.plugins[i].plugins.length; j++) {
                 var plugin = params.plugins[i].plugins[j];
-                plugin.params.elementid = params.elementid;
+                plugin.params.elementid = elementid;
                 plugin.params.group = group;
 
                 M['atto_' + plugin.name].init(plugin.params);
@@ -505,6 +507,18 @@ M.editor_atto = M.editor_atto || {
         Y.one('#' + elementid + '_toolbar').setAttribute('aria-activedescendant', current.generateID());
     },
 
+    /**
+     * Should we show the filepicker for this filetype?
+     *
+     * @param string elementid for this editor instance.
+     * @param string type The media type for the file picker
+     * @return boolean
+     */
+    can_show_filepicker : function(elementid, type) {
+        var options = M.editor_atto.filepickeroptions[elementid];
+        return ((typeof options[type]) !== "undefined");
+    },
+
     /**
      * Show the filepicker.
      * @param string elementid for this editor instance.