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 8123e211e2d..4a959342890 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
@@ -459,16 +459,14 @@ M.editor_atto = M.editor_atto || {
             bodyContent : menu,
             visible : false,
             width: overlaywidth + 'em',
-            lightbox: false,
             closeButton: false,
-            center : false
+            center : false,
+            render: true
         });
 
         M.editor_atto.menus[buttonpath + '_' + elementid] = overlay;
         overlay.align(button, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
-        overlay.hide();
         overlay.headerNode.hide();
-        overlay.render();
     },
 
     /**
@@ -1542,6 +1540,6 @@ Y.NodeList.importMethod(Y.Node.prototype, "cleanHTML");
         "event-simulate",
         "event-custom",
         "yui-throttle",
-        "moodle-core-notification"
+        "moodle-core-notification-dialogue"
     ]
 });
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 dff9a1229ec..7cfdede5df6 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,4 +1,4 @@
 YUI.add("moodle-editor_atto-editor",function(e,t){function i(){var e=this.getHTML(),t=[{regex:/<!--[\s\S]*?-->/gi,replace:""},{regex:/<\\?\?xml[^>]*>/gi,replace:""},{regex:/<\/?\w+:[^>]*>/gi,replace:""},{regex:/\s*MSO[-:][^;"']*;?/gi,replace:""},{regex:/<span[^>]*>(&nbsp;|\s)*<\/span>/gi,replace:""},{regex:/class="Mso[^"]*"/gi,replace:""},{regex:/<(\/?title|\/?meta|\/?style|\/?st\d|\/?head|\/?font|\/?html|\/?body|!\[)[^>]*?>/gi,replace:""},{regex:new RegExp(String.fromCharCode(8220),"gi"),replace:'"'},{regex:new RegExp(String.fromCharCode(8216),"gi"),replace:"'"},{regex:new RegExp(String.fromCharCode(8217),"gi"),replace:"'"},{regex:new RegExp(String.fromCharCode(8211),"gi"),replace:"-"},{regex:new RegExp(String.fromCharCode(8212),"gi"),replace:"--"},{regex:new RegExp(String.fromCharCode(189),"gi"),replace:"1/2"},{regex:new RegExp(String.fromCharCode(188),"gi"),replace:"1/4"},{regex:new RegExp(String.fromCharCode(190),"gi"),replace:"3/4"},{regex:new RegExp(String.fromCharCode(169),"gi"),replace:"(c)"},{regex:new RegExp(String.fromCharCode(174),"gi"),replace:"(r)"},{regex:new RegExp(String.fromCharCode(8230),"gi"),replace:"..."}],n=0,r;for(n=0;n<t.length;n++)r=t[n],e=e.replace(r.regex,r.replace);return this.setHTML(e),this}CSS={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto",HIGHLIGHT:"highlight"},M.editor_atto=M.editor_atto||{BLOCK_TAGS:["address","article","aside","audio","blockquote","canvas","dd","div","dl","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","header","hgroup","hr","noscript","ol","output","p","pre","section","table","tfoot","ul","video"],PLACEHOLDER_FONTNAME:"yui-tmp",ALL_NODES_SELECTOR:"[style],font[face]",FONT_FAMILY:"fontFamily",buttonhandlers:{},textupdatedhandlers:{},menus:{},menuhandlers:{},filepickeroptions:{},widgets:{},selections:{},focusfromclick:!1,showhide_menu_handler:function(t){t.preventDefault();var n=this.getAttribute("disabled"),r=this.getAttribute("data-menu"),i=M.editor_atto.menus[r],s=i.get("bodyContent");if(i.get("visible")||n)i.hide(),s.detach("clickoutside");else{s.on("clickoutside",function(e){e.target.ancestor()!==this&&e.target!==this&&i.get("visible")&&(s.detach("clickoutside"),i.hide())},this),i.align(e.one(e.config.doc.body),[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),i.show();var o=t.target.ancestor("button",!0).one("img");i.align(o,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),i.get("boundingBox").one("a").focus()}},buttonclicked_handler:function(t){var n=this.getAttribute("data-editor"),r=this.getAttribute("data-plugin"),i=this.getAttribute("data-button"),s=this.getAttribute("data-handler"),o=M.editor_atto.menus[r+"_"+n],u=M.editor_atto.get_toolbar_node(n),a=u.getAttribute("aria-activedescendant");a&&(current=e.one("#"+a),current.setAttribute("tabindex","-1")),this.setAttribute("tabindex",0),u.setAttribute("aria-activedescendant",this.generateID()),o&&o.hide();if(M.editor_atto.is_enabled(n,r,i))return s=M.editor_atto.buttonhandlers[s],s(t,n)},disable_all_widgets:function(e){var t,n,r=M.editor_atto.get_toolbar_node(e);for(t in M.editor_atto.widgets)n=r.one(".atto_"+t+"_button"),n&&n.setAttribute("disabled","true")},get_textarea_node:function(t){return e.one(document.getElementById(t))},get_toolbar_node:function(t){return e.one(document.getElementById(t+"_toolbar"))},get_editable_node:function(t){return e.one(document.getElementById(t+"editable"))},is_enabled:function(e,t,n){var r=t;n&&(r+="_"+n);var i=M.editor_atto.get_toolbar_node(e).one(".atto_"+r+"_button");return!i.hasAttribute("disabled")},is_highlighted:function(e,t,n){var r=t;n&&(r+="_"+n);var i=M.editor_atto.get_toolbar_node(e).one(".atto_"+r+"_button");return!i.hasClass(CSS.HIGHLIGHT)},enable_widget:function(e,t,n){var r=t;n&&(r+="_"+n);var i=M.editor_atto.get_toolbar_node(e).one(".atto_"+r+"_button");i&&i.removeAttribute("disabled")},add_widget_highlight:function(e,t,n){var r=t;n&&(r+="_"+n);var i=M.editor_atto.get_toolbar_node(e).one(".atto_"+r+"_button");i&&i.addClass(CSS.HIGHLIGHT)},remove_widget_highlight:function(e,t,n){var r=t;n&&(r+="_"+n);var i=M.editor_atto.get_toolbar_node(e).one(".atto_"+r+"_button");i&&i.removeClass(CSS.HIGHLIGHT)},enable_all_widgets:function(e){var t,n;for(t in M.editor_atto.widgets)n=M.editor_atto.get_toolbar_node(e).one(".atto_"+t+"_button"),n&&n.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,o,u,a,f){var l=M.editor_atto.get_toolbar_node(t),c=l.one(".atto_group."+i+"_group"),h,p,d,v;o?d=n+"_"+o:(o="",d=n),u||(u=M.util.get_string("pluginname","atto_"+n)),typeof a=="undefined"&&(a="14"),typeof f=="undefined"&&(f="transparent"),c||(c=e.Node.create('<div class="atto_group '+i+'_group"></div>'),l.append(c)),v=M.util.image_url("t/expanded","moodle"),p=e.Node.create('<button class="atto_'+d+'_button atto_hasmenu" '+'data-editor="'+e.Escape.html(t)+'" '+'tabindex="-1" '+'type="button" '+'data-menu="'+d+"_"+t+'" '+'title="'+e.Escape.html(u)+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" '+'style="background-color:'+f+';" src="'+r+'"/>'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+v+'"/>'+"</button>"),c.append(p),h=l.getAttribute("aria-activedescendant"),h||(p.setAttribute("tabindex","0"),l.setAttribute("aria-activedescendant",p.generateID())),M.editor_atto.widgets[d]=d;var m=e.Node.create('<div class="atto_'+d+"_menu"+' atto_menu" data-editor="'+e.Escape.html(t)+'"'+' style="min-width:'+(a-2)+'em"'+'"></div>'),g=0,y={};for(g=0;g<s.length;g++)y=s[g],m.append(e.Node.create('<div class="atto_menuentry"><a href="#" class="atto_'+d+"_action_"+g+'" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-button="'+e.Escape.html(o)+'" '+'data-handler="'+e.Escape
-.html(d+"_action_"+g)+'">'+y.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+g]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+d+"_action_"+g),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"32,enter",".atto_"+d+"_action_"+g),M.editor_atto.buttonhandlers[d+"_action_"+g]=y.handler);M.editor_atto.buttonhandlers[d]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+d+"_button"),M.editor_atto.buttonhandlers[d]=!0);var b=new M.core.dialogue({bodyContent:m,visible:!1,width:a+"em",lightbox:!1,closeButton:!1,center:!1});M.editor_atto.menus[d+"_"+t]=b,b.align(p,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),b.hide(),b.headerNode.hide(),b.render()},add_toolbar_button:function(t,n,r,i,s,o,u){var a=M.editor_atto.get_toolbar_node(t),f=a.one(".atto_group."+i+"_group"),l,c,h;o?c=n+"_"+o:(o="",c=n),u||(u=M.util.get_string("pluginname","atto_"+n)),f||(f=e.Node.create('<div class="atto_group '+i+'_group"></div>'),a.append(f)),l=e.Node.create('<button class="atto_'+c+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-button="'+e.Escape.html(o)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(c)+'" '+'title="'+e.Escape.html(u)+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+"</button>"),f.append(l),h=a.getAttribute("aria-activedescendant"),h||(l.setAttribute("tabindex","0"),a.setAttribute("aria-activedescendant",l.generateID())),M.editor_atto.buttonhandlers[c]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+c+"_button"),M.editor_atto.buttonhandlers[c]=s),M.editor_atto.widgets[c]=c},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&n.pop&&(n=n.pop());var r=null;n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer);var i=M.editor_atto.get_editable_node(t);return r&&i.contains(r)},focus:function(e){M.editor_atto.get_editable_node(e).focus()},init:function(t){var n=e.Node.create('<div class="'+CSS.WRAPPER+'" />'),r=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'role="textbox" '+'spellcheck="true" '+'aria-live="off" '+'class="'+CSS.CONTENT+'" '+'data-editor="'+t.elementid+'" />'),i=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar" aria-live="off"/>'),s=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />'),o=M.editor_atto.get_textarea_node(t.elementid),u=e.one('[for="'+t.elementid+'"]');u&&(u.generateID(),r.setAttribute("aria-labelledby",u.get("id")),i.setAttribute("aria-labelledby",u.get("id"))),s.appendChild(r),n.appendChild(i),n.appendChild(s),r.setStyle("minHeight",1.2*o.getAttribute("rows")+"em"),r.append(o.get("value")),r.cleanHTML(),o.get("parentNode").insert(n,o),M.editor_atto.disable_css_styling(),o.hide(),this.publish_events(),r.on("atto:selectionchanged",this.save_selection,this,t.elementid),r.on("focus",this.restore_selection,this,t.elementid),r.on("mousedown",function(){this.focusfromclick=!0},this),r.on("blur",function(){this.focusfromclick=!1,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 a,f,l,c;for(a=0;a<t.plugins.length;a++){l=t.plugins[a].group;for(f=0;f<t.plugins[a].plugins.length;f++)c=t.plugins[a].plugins[f],c.params.elementid=t.elementid,c.params.group=l,M["atto_"+c.name].init(c.params)}for(a=0;a<t.plugins.length;a++){l=t.plugins[a].group;for(f=0;f<t.plugins[a].plugins.length;f++)c=t.plugins[a].plugins[f],c.params.elementid=t.elementid,c.params.group=l,typeof M["atto_"+c.name].after_init!="undefined"&&M["atto_"+c.name].after_init(c.params)}},publish_events:function(){e.Event.define("atto:selectionchanged",{changeHandler:function(e,t){var n=t.sub.node.getAttribute("id");n=n.substring(0,n.length-8),e.elementid=n,e.selectedNodes=M.editor_atto.get_selected_nodes(n),e.selection=M.editor_atto.get_selection(),t.notifier.fire(e)},on:function(t,n,r){var i={notifier:r,sub:n};n.attoKeyDownDetach=t.on("keydown",e.throttle(this.changeHandler,100),this,i),n.attoMouseUpDetach=t.on("mouseup",e.throttle(this.changeHandler,100),this,i),n.attoFocusDetach=t.on("focus",e.throttle(this.changeHandler,100),this,i)},detach:function(e,t){t.attoKeyDownDetach.detach(),t.attoMouseUpDetach.detach(),t.attoFocusDetach.detach()},delegate:function(t,n,r,i){var s={notifier:r,sub:n};n.attoKeyDownDetachDelegate=t.delegate("keydown",e.throttle(this.changeHandler,100),i,this,s),n.attoMouseUpDetachDelegate=t.delegate("mouseup",e.throttle(this.changeHandler,100),i,this,s),n.attoFocusDetachDelegate=t.delegate("focus",e.throttle(this.changeHandler,100),i,this,s)},detachDelegate:function(e,t){t.attoKeyDownDetachDelegate.detach(),t.attoMouseUpDetachDelegate.detach(),t.attoFocusDetachDelegate.detach()}})},text_updated:function(e){var t=M.editor_atto.get_textarea_node(e),n=this.get_clean_html(e);t.set("value",n),t.simulate("change");var r=0;if(e in M.editor_atto.textupdatedhandlers)for(r=0;r<M.editor_atto.textupdatedhandlers[e].length;r++){var i=M.editor_atto.textupdatedhandlers[e][r];i(e)}},get_clean_html:function(t){var n=M.editor_atto.get_editable_node(t).cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),n.cleanHTML(),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o,u=M.editor_atto.get_toolbar_node(n);t.preventDefault(),r=u.all("empty"),u.all(".atto_group").each(function(e){e.hasAttribute("hidden")||(r=r.concat(e.all("button")))}),s=u.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(),u.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,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},save_selection:function(e,t){if(this.is_active(t)){var n=this.get_selection();n.length>0&&(this.selections[t]=n)}},restore_selection:function(e,t){e.preventDefault(),this.focusfromclick||typeof this.selections[t]!="undefined"&&this.set_selection(this.selections[t]),this.focusfromclick=!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)},selection_filter_matches:function(e,t,n){var r=!0;return n||(n=M.editor_atto.get_selected_nodes(e)),t="."+CSS.CONTENT+" "+t,n.size()===0?!1:(n.each(function(e){e.ancestor(t,!0)||(r=!1)}),r)},selection_filter:function(t,n){var r=M.editor_atto.get_selected_nodes(t),i=new e.NodeList;return n="."+CSS.CONTENT+" "+n,r.each(function(e){e.ancestors(n,!0).each(function(e){i.indexOf(e)===-1&&i.push(e)})}),i},get_selected_nodes:function(t){var n=M.editor_atto.get_editable_node(t),r=M.editor_atto.get_selection_start_container(),i=M.editor_atto.get_selection_end_container();if(!r||!i)return new e.NodeList;var s=function(t,n,i,o,u){var a=new e.NodeList;if(n===t)if(n!==t||r!==t||!u||!t.hasChildNodes())return t.hasChildNodes()||a.push(t),a;if(t.hasChildNodes()){var f=t.get("childNodes"),l=f.item(o);l&&a.concat(s(l,n,i,0,!1))}else a.push(t);if(t===i)return a;var c=t.ancestor();if(c){var h=c.get("childNodes").indexOf(t);a.concat(s(c,n,i,h+1,!1))}return a};return s(r,i,n,0,!0)},get_selection_start_container:function(){var t=M.editor_atto.get_selection();t.length&&t.pop&&(t=t.pop());if(t.startContainer)return e.one(t.startContainer);if(t.parentElement){var n=t.duplicate();return n.collapse(!0),e.one(n.parentElement())}},get_selection_end_container:function(){var t=M.editor_atto.get_selection();t.length&&t.pop&&(t=t.pop());if(t.endContainer)return e.one(t.endContainer);if(t.parentElement){var n=t.duplicate();return n.collapse(!1),e.one(n.parentElement())}return!1},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();return e.length&&(e=e.pop()),e.commonAncestorContainer?e.commonAncestorContainer:e.parentElement?e.parentElement():!1},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()},format_selection_block:function(t,n,r){var i=M.editor_atto.get_selection_parent_node(),s,o,u,a,f,l;if(!i)return;s=M.editor_atto.get_editable_node(t),i=e.one(i),o=i.ancestor(function(e){var t=e.get("tagName");return t&&(t=t.toLowerCase()),e===s||t==="td"||t==="th"},!0),o&&(s=o),u=i.ancestor(M.editor_atto.BLOCK_TAGS.join(", "),!0),u&&(f=u.ancestor(function(e){return e===s},!1),f||(u=!1)),u||(a=e.Node.create("<p></p>"),s.get("childNodes").each(function(e){a.append(e.remove())}),s.append(a),u=a),n&&n!==""&&(l=e.Node.create("<"+n+"></"+n+">"),l.setAttrs(u.getAttrs()),u.get("childNodes").each(function(e){e.remove(),l.append(e)}),u.replace(l),u=l),r&&u.setAttrs(r);var c=M.editor_atto.get_selection_from_node(u);return M.editor_atto.set_selection(c),u},disable_css_styling:function(){try{document.execCommand("styleWithCSS",0,!1)}catch(e){try{document.execCommand("useCSS",0,!0)}catch(t){try{document.execCommand("styleWithCSS",!1,!1)}catch(n){}}}},enable_css_styling:function(){try{document.execCommand("styleWithCSS",0,!0)}catch(e){try{document.execCommand("useCSS",0,!1)}catch(t){try{document.execCommand("styleWithCSS",!1,!0)}catch(n){}}}},insert_html_at_focus_point:function(e){if(document.selection&&document.selection.createRange){var t=document.selection.createRange();t.pasteHTML&&t.pasteHTML(e)}else document.execCommand("insertHTML",!1,e)},toggle_inline_selection_class:function(t,n){var r=M.editor_atto.get_selection_parent_node(),i=e.one("body"),s,o=[],u,a,f,l=0;if(!r)return;document.execCommand("fontname",!1,M.editor_atto.PLACEHOLDER_FONTNAME),s=i.all(M.editor_atto.ALL_NODES_SELECTOR),s.each(function(t,n){t.getStyle(M.editor_atto.FONT_FAMILY)===M.editor_atto.PLACEHOLDER_FONTNAME&&(t.setStyle(M.editor_atto.FONT_FAMILY,""),t.compareTo(i)||o.push(e.Node.getDOMNode(s.item(n))))});for(l=0;l<o.length;l++){a=e.one(o[l]),u=a.ancestor(".editor_atto_content span"),u?a=u:(f=e.Node.create("<span></span>"),f.append(o[l].innerHTML),a.replace(f),a=f);for(var c=0;c<n.length;c++)a.toggleClass(n[c])}}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",e.hideOn=[{eventName:"clickoutside"}],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)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r,e.Node.addMethod("cleanHTML",i),e.NodeList.importMethod(e.Node.prototype,"cleanHTML")},"@VERSION@",{requires:["node","io","overlay","escape","event","event-simulate"
-,"event-custom","yui-throttle","moodle-core-notification"]});
+.html(d+"_action_"+g)+'">'+y.text+"</a>"+"</div>")),M.editor_atto.buttonhandlers[n+"_action_"+g]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+d+"_action_"+g),e.one("body").delegate("key",M.editor_atto.buttonclicked_handler,"32,enter",".atto_"+d+"_action_"+g),M.editor_atto.buttonhandlers[d+"_action_"+g]=y.handler);M.editor_atto.buttonhandlers[d]||(e.one("body").delegate("click",M.editor_atto.showhide_menu_handler,".atto_"+d+"_button"),M.editor_atto.buttonhandlers[d]=!0);var b=new M.core.dialogue({bodyContent:m,visible:!1,width:a+"em",closeButton:!1,center:!1,render:!0});M.editor_atto.menus[d+"_"+t]=b,b.align(p,[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.BL]),b.headerNode.hide()},add_toolbar_button:function(t,n,r,i,s,o,u){var a=M.editor_atto.get_toolbar_node(t),f=a.one(".atto_group."+i+"_group"),l,c,h;o?c=n+"_"+o:(o="",c=n),u||(u=M.util.get_string("pluginname","atto_"+n)),f||(f=e.Node.create('<div class="atto_group '+i+'_group"></div>'),a.append(f)),l=e.Node.create('<button class="atto_'+c+'_button" '+'data-editor="'+e.Escape.html(t)+'" '+'data-plugin="'+e.Escape.html(n)+'" '+'data-button="'+e.Escape.html(o)+'" '+'tabindex="-1" '+'data-handler="'+e.Escape.html(c)+'" '+'title="'+e.Escape.html(u)+'">'+'<img class="icon" aria-hidden="true" role="presentation" width="16" height="16" src="'+r+'"/>'+"</button>"),f.append(l),h=a.getAttribute("aria-activedescendant"),h||(l.setAttribute("tabindex","0"),a.setAttribute("aria-activedescendant",l.generateID())),M.editor_atto.buttonhandlers[c]||(e.one("body").delegate("click",M.editor_atto.buttonclicked_handler,".atto_"+c+"_button"),M.editor_atto.buttonhandlers[c]=s),M.editor_atto.widgets[c]=c},is_active:function(t){var n=M.editor_atto.get_selection();n.length&&n.pop&&(n=n.pop());var r=null;n.parentElement?r=e.one(n.parentElement()):r=e.one(n.startContainer);var i=M.editor_atto.get_editable_node(t);return r&&i.contains(r)},focus:function(e){M.editor_atto.get_editable_node(e).focus()},init:function(t){var n=e.Node.create('<div class="'+CSS.WRAPPER+'" />'),r=e.Node.create('<div id="'+t.elementid+'editable" '+'contenteditable="true" '+'role="textbox" '+'spellcheck="true" '+'aria-live="off" '+'class="'+CSS.CONTENT+'" '+'data-editor="'+t.elementid+'" />'),i=e.Node.create('<div class="'+CSS.TOOLBAR+'" id="'+t.elementid+'_toolbar" role="toolbar" aria-live="off"/>'),s=e.Node.create('<div class="'+CSS.CONTENTWRAPPER+'" />'),o=M.editor_atto.get_textarea_node(t.elementid),u=e.one('[for="'+t.elementid+'"]');u&&(u.generateID(),r.setAttribute("aria-labelledby",u.get("id")),i.setAttribute("aria-labelledby",u.get("id"))),s.appendChild(r),n.appendChild(i),n.appendChild(s),r.setStyle("minHeight",1.2*o.getAttribute("rows")+"em"),r.append(o.get("value")),r.cleanHTML(),o.get("parentNode").insert(n,o),M.editor_atto.disable_css_styling(),o.hide(),this.publish_events(),r.on("atto:selectionchanged",this.save_selection,this,t.elementid),r.on("focus",this.restore_selection,this,t.elementid),r.on("mousedown",function(){this.focusfromclick=!0},this),r.on("blur",function(){this.focusfromclick=!1,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 a,f,l,c;for(a=0;a<t.plugins.length;a++){l=t.plugins[a].group;for(f=0;f<t.plugins[a].plugins.length;f++)c=t.plugins[a].plugins[f],c.params.elementid=t.elementid,c.params.group=l,M["atto_"+c.name].init(c.params)}for(a=0;a<t.plugins.length;a++){l=t.plugins[a].group;for(f=0;f<t.plugins[a].plugins.length;f++)c=t.plugins[a].plugins[f],c.params.elementid=t.elementid,c.params.group=l,typeof M["atto_"+c.name].after_init!="undefined"&&M["atto_"+c.name].after_init(c.params)}},publish_events:function(){e.Event.define("atto:selectionchanged",{changeHandler:function(e,t){var n=t.sub.node.getAttribute("id");n=n.substring(0,n.length-8),e.elementid=n,e.selectedNodes=M.editor_atto.get_selected_nodes(n),e.selection=M.editor_atto.get_selection(),t.notifier.fire(e)},on:function(t,n,r){var i={notifier:r,sub:n};n.attoKeyDownDetach=t.on("keydown",e.throttle(this.changeHandler,100),this,i),n.attoMouseUpDetach=t.on("mouseup",e.throttle(this.changeHandler,100),this,i),n.attoFocusDetach=t.on("focus",e.throttle(this.changeHandler,100),this,i)},detach:function(e,t){t.attoKeyDownDetach.detach(),t.attoMouseUpDetach.detach(),t.attoFocusDetach.detach()},delegate:function(t,n,r,i){var s={notifier:r,sub:n};n.attoKeyDownDetachDelegate=t.delegate("keydown",e.throttle(this.changeHandler,100),i,this,s),n.attoMouseUpDetachDelegate=t.delegate("mouseup",e.throttle(this.changeHandler,100),i,this,s),n.attoFocusDetachDelegate=t.delegate("focus",e.throttle(this.changeHandler,100),i,this,s)},detachDelegate:function(e,t){t.attoKeyDownDetachDelegate.detach(),t.attoMouseUpDetachDelegate.detach(),t.attoFocusDetachDelegate.detach()}})},text_updated:function(e){var t=M.editor_atto.get_textarea_node(e),n=this.get_clean_html(e);t.set("value",n),t.simulate("change");var r=0;if(e in M.editor_atto.textupdatedhandlers)for(r=0;r<M.editor_atto.textupdatedhandlers[e].length;r++){var i=M.editor_atto.textupdatedhandlers[e][r];i(e)}},get_clean_html:function(t){var n=M.editor_atto.get_editable_node(t).cloneNode(!0);return e.each(n.all("[id]"),function(e){var t=e.get("id");t.indexOf("yui")===0&&e.removeAttribute("id")}),n.cleanHTML(),n.getHTML()},keyboard_navigation:function(t,n){var r,i,s,o,u=M.editor_atto.get_toolbar_node(n);t.preventDefault(),r=u.all("empty"),u.all(".atto_group").each(function(e){e.hasAttribute("hidden")||(r=r.concat(e.all("button")))}),s=u.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(),u.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,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},save_selection:function(e,t){if(this.is_active(t)){var n=this.get_selection();n.length>0&&(this.selections[t]=n)}},restore_selection:function(e,t){e.preventDefault(),this.focusfromclick||typeof this.selections[t]!="undefined"&&this.set_selection(this.selections[t]),this.focusfromclick=!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)},selection_filter_matches:function(e,t,n){var r=!0;return n||(n=M.editor_atto.get_selected_nodes(e)),t="."+CSS.CONTENT+" "+t,n.size()===0?!1:(n.each(function(e){e.ancestor(t,!0)||(r=!1)}),r)},selection_filter:function(t,n){var r=M.editor_atto.get_selected_nodes(t),i=new e.NodeList;return n="."+CSS.CONTENT+" "+n,r.each(function(e){e.ancestors(n,!0).each(function(e){i.indexOf(e)===-1&&i.push(e)})}),i},get_selected_nodes:function(t){var n=M.editor_atto.get_editable_node(t),r=M.editor_atto.get_selection_start_container(),i=M.editor_atto.get_selection_end_container();if(!r||!i)return new e.NodeList;var s=function(t,n,i,o,u){var a=new e.NodeList;if(n===t)if(n!==t||r!==t||!u||!t.hasChildNodes())return t.hasChildNodes()||a.push(t),a;if(t.hasChildNodes()){var f=t.get("childNodes"),l=f.item(o);l&&a.concat(s(l,n,i,0,!1))}else a.push(t);if(t===i)return a;var c=t.ancestor();if(c){var h=c.get("childNodes").indexOf(t);a.concat(s(c,n,i,h+1,!1))}return a};return s(r,i,n,0,!0)},get_selection_start_container:function(){var t=M.editor_atto.get_selection();t.length&&t.pop&&(t=t.pop());if(t.startContainer)return e.one(t.startContainer);if(t.parentElement){var n=t.duplicate();return n.collapse(!0),e.one(n.parentElement())}},get_selection_end_container:function(){var t=M.editor_atto.get_selection();t.length&&t.pop&&(t=t.pop());if(t.endContainer)return e.one(t.endContainer);if(t.parentElement){var n=t.duplicate();return n.collapse(!1),e.one(n.parentElement())}return!1},get_selection_parent_node:function(){var e=M.editor_atto.get_selection();return e.length&&(e=e.pop()),e.commonAncestorContainer?e.commonAncestorContainer:e.parentElement?e.parentElement():!1},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()},format_selection_block:function(t,n,r){var i=M.editor_atto.get_selection_parent_node(),s,o,u,a,f,l;if(!i)return;s=M.editor_atto.get_editable_node(t),i=e.one(i),o=i.ancestor(function(e){var t=e.get("tagName");return t&&(t=t.toLowerCase()),e===s||t==="td"||t==="th"},!0),o&&(s=o),u=i.ancestor(M.editor_atto.BLOCK_TAGS.join(", "),!0),u&&(f=u.ancestor(function(e){return e===s},!1),f||(u=!1)),u||(a=e.Node.create("<p></p>"),s.get("childNodes").each(function(e){a.append(e.remove())}),s.append(a),u=a),n&&n!==""&&(l=e.Node.create("<"+n+"></"+n+">"),l.setAttrs(u.getAttrs()),u.get("childNodes").each(function(e){e.remove(),l.append(e)}),u.replace(l),u=l),r&&u.setAttrs(r);var c=M.editor_atto.get_selection_from_node(u);return M.editor_atto.set_selection(c),u},disable_css_styling:function(){try{document.execCommand("styleWithCSS",0,!1)}catch(e){try{document.execCommand("useCSS",0,!0)}catch(t){try{document.execCommand("styleWithCSS",!1,!1)}catch(n){}}}},enable_css_styling:function(){try{document.execCommand("styleWithCSS",0,!0)}catch(e){try{document.execCommand("useCSS",0,!1)}catch(t){try{document.execCommand("styleWithCSS",!1,!0)}catch(n){}}}},insert_html_at_focus_point:function(e){if(document.selection&&document.selection.createRange){var t=document.selection.createRange();t.pasteHTML&&t.pasteHTML(e)}else document.execCommand("insertHTML",!1,e)},toggle_inline_selection_class:function(t,n){var r=M.editor_atto.get_selection_parent_node(),i=e.one("body"),s,o=[],u,a,f,l=0;if(!r)return;document.execCommand("fontname",!1,M.editor_atto.PLACEHOLDER_FONTNAME),s=i.all(M.editor_atto.ALL_NODES_SELECTOR),s.each(function(t,n){t.getStyle(M.editor_atto.FONT_FAMILY)===M.editor_atto.PLACEHOLDER_FONTNAME&&(t.setStyle(M.editor_atto.FONT_FAMILY,""),t.compareTo(i)||o.push(e.Node.getDOMNode(s.item(n))))});for(l=0;l<o.length;l++){a=e.one(o[l]),u=a.ancestor(".editor_atto_content span"),u?a=u:(f=e.Node.create("<span></span>"),f.append(o[l].innerHTML),a.replace(f),a=f);for(var c=0;c<n.length;c++)a.toggleClass(n[c])}}};var n="Controlmenu",r;r=function(e){e.draggable=!1,e.center=!1,e.width="auto",e.lightbox=!1,e.footerContent="",e.hideOn=[{eventName:"clickoutside"}],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)}},{NAME:n,ATTRS:{headerText:{value:""}}}),M.editor_atto=M.editor_atto||{},M.editor_atto.controlmenu=r,e.Node.addMethod("cleanHTML",i),e.NodeList.importMethod(e.Node.prototype,"cleanHTML")},"@VERSION@",{requires:["node","io","overlay","escape","event","event-simulate","event-custom","yui-throttle"
+,"moodle-core-notification-dialogue"]});
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 8123e211e2d..4a959342890 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
@@ -459,16 +459,14 @@ M.editor_atto = M.editor_atto || {
             bodyContent : menu,
             visible : false,
             width: overlaywidth + 'em',
-            lightbox: false,
             closeButton: false,
-            center : false
+            center : false,
+            render: true
         });
 
         M.editor_atto.menus[buttonpath + '_' + elementid] = overlay;
         overlay.align(button, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
-        overlay.hide();
         overlay.headerNode.hide();
-        overlay.render();
     },
 
     /**
@@ -1542,6 +1540,6 @@ Y.NodeList.importMethod(Y.Node.prototype, "cleanHTML");
         "event-simulate",
         "event-custom",
         "yui-throttle",
-        "moodle-core-notification"
+        "moodle-core-notification-dialogue"
     ]
 });
diff --git a/lib/editor/atto/yui/src/editor/js/editor.js b/lib/editor/atto/yui/src/editor/js/editor.js
index c1dd74fee80..36b2f780d75 100755
--- a/lib/editor/atto/yui/src/editor/js/editor.js
+++ b/lib/editor/atto/yui/src/editor/js/editor.js
@@ -457,16 +457,14 @@ M.editor_atto = M.editor_atto || {
             bodyContent : menu,
             visible : false,
             width: overlaywidth + 'em',
-            lightbox: false,
             closeButton: false,
-            center : false
+            center : false,
+            render: true
         });
 
         M.editor_atto.menus[buttonpath + '_' + elementid] = overlay;
         overlay.align(button, [Y.WidgetPositionAlign.TL, Y.WidgetPositionAlign.BL]);
-        overlay.hide();
         overlay.headerNode.hide();
-        overlay.render();
     },
 
     /**
diff --git a/lib/editor/atto/yui/src/editor/meta/editor.json b/lib/editor/atto/yui/src/editor/meta/editor.json
index 699906d4dd0..c32590c9759 100644
--- a/lib/editor/atto/yui/src/editor/meta/editor.json
+++ b/lib/editor/atto/yui/src/editor/meta/editor.json
@@ -9,7 +9,7 @@
         "event-simulate",
         "event-custom",
         "yui-throttle",
-        "moodle-core-notification"
+        "moodle-core-notification-dialogue"
       ]
   },
   "moodle-editor_atto-editor-shortcut": {