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 21ab03ff8c0..d04ecdfc9f5 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
@@ -472,12 +472,16 @@ Y.namespace('M.editor_atto.Editor').init = function(config) {
  * A notify function for the Atto editor.
  *
  * @module     moodle-editor_atto-notify
- * @submodule  notify-base
+ * @submodule  notify
  * @package    editor_atto
  * @copyright  2014 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+var LOGNAME_NOTIFY = 'moodle-editor_atto-editor-notify',
+    NOTIFY_INFO = 'info',
+    NOTIFY_WARNING = 'warning';
+
 function EditorNotify() {}
 
 EditorNotify.ATTRS= {
@@ -486,10 +490,10 @@ EditorNotify.ATTRS= {
 EditorNotify.prototype = {
 
     /**
-     * A single Y.Overlay for this editor. There is only ever one - it is replaced if a new message comes in.
+     * A single Y.Node for this editor. There is only ever one - it is replaced if a new message comes in.
      *
      * @property messageOverlay
-     * @type {Y.Overlay}
+     * @type {Node}
      */
     messageOverlay: null,
 
@@ -521,12 +525,15 @@ EditorNotify.prototype = {
      * Show a notification in a floaty overlay somewhere in the atto editor text area.
      *
      * @method showMessage
-     * @param {String} message - The translated message (use get_string)
-     * @param {String} type - Must be either "info" or "warning"
-     * @param {Integer} timeout - Time in milliseconds to show this message for.
+     * @param {String} message The translated message (use get_string)
+     * @param {String} type Must be either "info" or "warning"
+     * @param {Number} timeout Time in milliseconds to show this message for.
      * @chainable
      */
     showMessage: function(message, type, timeout) {
+        var messageTypeIcon = '',
+            intTimeout,
+            bodyContent;
 
         if (this.messageOverlay === null) {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
@@ -543,29 +550,28 @@ EditorNotify.prototype = {
             this.hideTimer.cancel();
         }
 
-        var messageTypeIcon = '';
-        if (type === "warning") {
+        if (type === NOTIFY_WARNING) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/warning', 'moodle') +
                               '" alt="' + M.util.get_string('warning', 'moodle') + '"/>';
-        } else if (type === "info") {
+        } else if (type === NOTIFY_INFO) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/info', 'moodle') +
                               '" alt="' + M.util.get_string('info', 'moodle') + '"/>';
         } else {
-            Y.log('Invalid message type specified: ' + type + '. Must be either "info" or "warning".', 'debug');
+            Y.log('Invalid message type specified: ' + type + '. Must be either "info" or "warning".', 'debug', LOGNAME_NOTIFY);
         }
 
         // Parse the timeout value.
-        var inttimeout = parseInt(timeout, 10);
-        if (inttimeout <= 0) {
-            inttimeout = 60000;
+        intTimeout = parseInt(timeout, 10);
+        if (intTimeout <= 0) {
+            intTimeout = 60000;
         }
 
         // Convert class to atto_info (for example).
         type = 'atto_' + type;
 
-        var bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
+        bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
                                         messageTypeIcon + ' ' +
                                         Y.Escape.html(message) +
                                         '</div>');
@@ -573,8 +579,8 @@ EditorNotify.prototype = {
         this.messageOverlay.append(bodyContent);
         this.messageOverlay.show();
 
-        this.hideTimer = Y.later(inttimeout, this, function() {
-            Y.log('Hide Atto notification.', 'debug');
+        this.hideTimer = Y.later(intTimeout, this, function() {
+            Y.log('Hide Atto notification.', 'debug', LOGNAME_NOTIFY);
             this.hideTimer = null;
             this.messageOverlay.hide();
         });
@@ -722,7 +728,8 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorTextArea]);
  */
 
 var SUCCESS_MESSAGE_TIMEOUT = 5000,
-    RECOVER_MESSAGE_TIMEOUT = 60000;
+    RECOVER_MESSAGE_TIMEOUT = 60000,
+    LOGNAME_AUTOSAVE = 'moodle-editor_atto-editor-autosave';
 
 function EditorAutosave() {}
 
@@ -743,7 +750,7 @@ EditorAutosave.ATTRS= {
      * The time between autosaves (in seconds).
      *
      * @attribute autosaveFrequency
-     * @type Integer
+     * @type Number
      * @default 60
      * @writeOnce
      */
@@ -811,22 +818,21 @@ EditorAutosave.prototype = {
         Y.io(url, {
             method: 'POST',
             data: params,
+            context: this,
             on: {
                 success: function(id,o) {
                     if (typeof o.responseText !== "undefined" &&
                         o.responseText !== "" &&
                         o.responseText !== this.textarea.get('value')) {
-                        Y.log('Autosave text found - confirm recovery.');
+                        Y.log('Autosave text found - confirm recovery.', 'debug', LOGNAME_AUTOSAVE);
                         this.recoverText(o.responseText);
                     }
                 }
-            },
-            context: this
+            }
         });
 
         // Now setup the timer for periodic saves.
 
-        Y.log(this.get('autosaveFrequency'));
         var delay = parseInt(this.get('autosaveFrequency'), 10) * 1000;
         Y.later(delay, this, this.saveDraft, false, true);
 
@@ -853,7 +859,6 @@ EditorAutosave.prototype = {
             pagedomid: Y.one('body').get('id')
         };
 
-        // We don't even wait!
         Y.io(url, {
             method: 'POST',
             data: params,
@@ -876,7 +881,7 @@ EditorAutosave.prototype = {
         this.updateOriginal();
         this.lastText = text;
 
-        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), 'info', RECOVER_MESSAGE_TIMEOUT);
+        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), NOTIFY_INFO, RECOVER_MESSAGE_TIMEOUT);
 
         return this;
     },
@@ -892,7 +897,7 @@ EditorAutosave.prototype = {
         var newText = this.textarea.get('value');
 
         if (newText !== this.lastText) {
-            Y.log('Autosave text');
+            Y.log('Autosave text', 'debug', LOGNAME_AUTOSAVE);
 
             // Make an ajax request.
             url = M.cfg.wwwroot + '/lib/editor/atto/autosave-ajax.php';
@@ -905,35 +910,32 @@ EditorAutosave.prototype = {
                 pagedomid: Y.one('body').get('id'),
                 pageinstance: this.autosaveInstance
             };
-            var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+
+            // Reusable error handler - must be passed the correct context.
+            var ajaxErrorFunction = function(code, response) {
+                var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+                Y.log('Error while autosaving text:' + code, 'warn', LOGNAME_AUTOSAVE);
+                Y.log(response, 'warn', LOGNAME_AUTOSAVE);
+                this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), NOTIFY_WARNING, errorDuration);
+            };
 
             Y.io(url, {
                 method: 'POST',
                 data: params,
+                context: this,
                 on: {
-                    error: function(code, response) {
-                        Y.log('Error while autosaving text:' + code, 'warn');
-                        Y.log(response, 'warn');
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
-                    failure: function(code, response) {
-                        Y.log('Failure while autosaving text:' + code, 'warn');
-                        Y.log(response, 'warn');
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
+                    error: ajaxErrorFunction,
+                    failure: ajaxErrorFunction,
                     success: function(code, response) {
                         if (response.response !== "") {
-                            Y.log('Failure while autosaving text.', 'warn');
-                            Y.log(response, 'debug');
-                            this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
+                            ajaxErrorFunction(code, response);
                         } else {
                             // All working.
                             this.lastText = newText;
-                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), 'info', SUCCESS_MESSAGE_TIMEOUT);
+                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), NOTIFY_INFO, SUCCESS_MESSAGE_TIMEOUT);
                         }
                     }
-                },
-                context: this
+                }
             });
         }
         return this;
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 a6115c86919..2ac05e9f227 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,3 +1,3 @@
-YUI.add("moodle-editor_atto-editor",function(e,t){function i(){i.superclass.constructor.apply(this,arguments)}function s(){}function o(){}function f(){}function l(){}function c(){}function h(){}function p(){}function d(){}function v(){}var n="moodle-editor_atto-editor",r={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto",HIGHLIGHT:"highlight"};e.extend(i,e.Base,{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_CLASS:"atto-tmp-class",ALL_NODES_SELECTOR:"[style],font[face]",FONT_FAMILY:"fontFamily",_wrapper:null,editor:null,textarea:null,textareaLabel:null,plugins:null,_eventHandles:null,initializer:function(){var t;this.textarea=e.one(document.getElementById(this.get("elementid")));if(!this.textarea)return;this._eventHandles=[],this._wrapper=e.Node.create('<div class="'+r.WRAPPER+'" />'),t=e.Handlebars.compile('<div id="{{elementid}}editable" contenteditable="true" role="textbox" spellcheck="true" aria-live="off" class="{{CSS.CONTENT}}" />'),this.editor=e.Node.create(t({elementid:this.get("elementid"),CSS:r})),this.textareaLabel=e.one('[for="'+this.get("elementid")+'"]'),this.textareaLabel&&(this.textareaLabel.generateID(),this.editor.setAttribute("aria-labelledby",this.textareaLabel.get("id"))),this.setupToolbar();var n=e.Node.create('<div class="'+r.CONTENTWRAPPER+'" />');n.appendChild(this.editor),this._wrapper.appendChild(n),this.editor.setStyle("minHeight",20*this.textarea.getAttribute("rows")+8+"px"),e.UA.ie===0&&this.editor.setStyle("height",20*this.textarea.getAttribute("rows")+8+"px"),this.disableCssStyling(),document.queryCommandSupported("DefaultParagraphSeparator")&&document.execCommand("DefaultParagraphSeparator",!1,"p"),this.textarea.get("parentNode").insert(this._wrapper,this.textarea),this.textarea.hide(),this.updateFromTextArea(),this.publishEvents(),this.setupSelectionWatchers(),this.setupAutomaticPolling(),this.setupPlugins(),this.setupAutosave(),this.setupNotifications()},focus:function(){return this.editor.focus(),this},publishEvents:function(){return this.publish("change",{broadcast:!0,preventable:!0}),this.publish("pluginsloaded",{fireOnce:!0}),this.publish("atto:selectionchanged",{prefix:"atto"}),this},setupAutomaticPolling:function(){return this._registerEventHandle(this.editor.on(["keyup","paste","cut"],this.updateOriginal,this)),this},setupPlugins:function(){this.plugins={};var t=this.get("plugins"),n,r,i,s,o;for(n in t){r=t[n];if(!r.plugins)continue;for(i in r.plugins){s=r.plugins[i],o=e.mix({name:s.name,group:r.group,editor:this.editor,toolbar:this.toolbar,host:this},s);if(typeof e.M["atto_"+s.name]=="undefined")continue;this.plugins[s.name]=new e.M["atto_"+s.name].Button(o)}}return this.fire("pluginsloaded"),this},enablePlugins:function(e){this._setPluginState(!0,e)},disablePlugins:function(e){this._setPluginState(!1,e)},_setPluginState:function(t,n){var r="disableButtons";t&&(r="enableButtons"),n?this.plugins[n][r]():e.Object.each(this.plugins,function(e){e[r]()},this)},_registerEventHandle:function(e){this._eventHandles.push(e)}},{NS:"editor_atto",ATTRS:{elementid:{value:null,writeOnce:!0},contextid:{value:null,writeOnce:!0},plugins:{value:{},writeOnce:!0}}}),e.augment(i,e.EventTarget),e.namespace("M.editor_atto").Editor=i,e.namespace("M.editor_atto.Editor").init=function(t){return new e.M.editor_atto.Editor(t)},s.ATTRS={},s.prototype={messageOverlay:null,hideTimer:null,setupNotifications:function(){var e=new Image,t=new Image;return e.src=M.util.image_url("i/warning","moodle"),t.src=M.util.image_url("i/info","moodle"),this},showMessage:function(t,n,r){this.messageOverlay===null&&(this.messageOverlay=e.Node.create('<div class="editor_atto_notification"></div>'),this.messageOverlay.hide(),this._wrapper.append(this.messageOverlay),this.messageOverlay.on("click",function(){this.messageOverlay.hide()},this)),this.hideTimer!==null&&this.hideTimer.cancel();var i="";n==="warning"?i='<img src="'+M.util.image_url("i/warning","moodle")+'" alt="'+M.util.get_string("warning","moodle")+'"/>':n==="info"&&(i='<img src="'+M.util.image_url("i/info","moodle")+'" alt="'+M.util.get_string("info","moodle")+'"/>');var s=parseInt(r,10);s<=0&&(s=6e4),n="atto_"+n;var o=e.Node.create('<div class="'+n+'" role="alert" aria-live="assertive">'+i+" "+e.Escape.html(t)+"</div>");return this.messageOverlay.empty(),this.messageOverlay.append(o),this.messageOverlay.show(),this.hideTimer=e.later(s,this,function(){this.hideTimer=null,this.messageOverlay.hide()}),this}},e.Base.mix(e.M.editor_atto.Editor,[s]),o.ATTRS={},o.prototype={_getEmptyContent:function(){return e.UA.ie&&e.UA.ie<10?"<p></p>":"<p><br></p>"},updateFromTextArea:function(){this.editor.setHTML(""),this.editor.append(this.textarea.get("value")),this.cleanEditorHTML(),this.editor.getHTML()===""&&this.editor.setHTML(this._getEmptyContent())},updateOriginal:function(){var e=this.textarea.get("value"),t=this.getCleanHTML();return t===""&&this.isActive()&&(t=this._getEmptyContent()),e!==t&&(this.textarea.set("value",t),this.textarea.simulate("change"),this.fire("change")),this}},e.Base.mix(e.M.editor_atto.Editor,[o]);var u=5e3,a=6e4;f.ATTRS={autosaveEnabled:{value:!0,writeOnce:!0},autosaveFrequency:{value:60,writeOnce:!0}},f.prototype={lastText:null,autosaveInstance:null,setupAutosave:function(){var t=-1,n=null,r=this.get("filepickeroptions");if(!this.get("autosaveEnabled"))return;this.autosaveInstance=e.stamp(this);for(n in r)typeof r[n].itemid!="undefined"&&(t=r[n].itemid);url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"resume",drafttext:"",draftid:t,elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagedomid:e.one("body").get("id")},e.io(url,{method
-:"POST",data:params,on:{success:function(e,t){typeof t.responseText!="undefined"&&t.responseText!==""&&t.responseText!==this.textarea.get("value")&&this.recoverText(t.responseText)}},context:this});var i=parseInt(this.get("autosaveFrequency"),10)*1e3;return e.later(i,this,this.saveDraft,!1,!0),this.textarea.ancestor("form").on("submit",this.resetAutosave,this),this},resetAutosave:function(){return url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"reset",elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagedomid:e.one("body").get("id")},e.io(url,{method:"POST",data:params,sync:!0}),this},recoverText:function(e){return this.editor.setHTML(e),this.saveSelection(),this.updateOriginal(),this.lastText=e,this.showMessage(M.util.get_string("textrecovered","editor_atto"),"info",a),this},saveDraft:function(){this.updateOriginal();var t=this.textarea.get("value");if(t!==this.lastText){url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"save",drafttext:t,elementid:this.get("elementid"),pagedomid:e.one("body").get("id"),pageinstance:this.autosaveInstance};var n=parseInt(this.get("autosaveFrequency"),10)*1e3;e.io(url,{method:"POST",data:params,on:{error:function(e,t){this.showMessage(M.util.get_string("autosavefailed","editor_atto"),"warning",n)},failure:function(e,t){this.showMessage(M.util.get_string("autosavefailed","editor_atto"),"warning",n)},success:function(e,r){r.response!==""?this.showMessage(M.util.get_string("autosavefailed","editor_atto"),"warning",n):(this.lastText=t,this.showMessage(M.util.get_string("autosavesucceeded","editor_atto"),"info",u))}},context:this})}return this}},e.Base.mix(e.M.editor_atto.Editor,[f]),l.ATTRS={},l.prototype={getCleanHTML:function(){var t=this.editor.cloneNode(!0),n;return e.each(t.all('[id^="yui"]'),function(e){e.removeAttribute("id")}),t.all(".atto_control").remove(!0),n=t.get("innerHTML"),n==="<p></p>"||n==="<p><br></p>"?"":this._cleanHTML(n)},cleanEditorHTML:function(){var e=this.editor.get("innerHTML");return this.editor.set("innerHTML",this._cleanHTML(e)),this},_cleanHTML:function(e){var 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;for(n=0;n<t.length;n++)e=e.replace(t[n].regex,t[n].replace);return e}},e.Base.mix(e.M.editor_atto.Editor,[l]),c.ATTRS={},c.prototype={toolbar:null,openMenus:null,setupToolbar:function(){return this.toolbar=e.Node.create('<div class="'+r.TOOLBAR+'" role="toolbar" aria-live="off"/>'),this.openMenus=[],this._wrapper.appendChild(this.toolbar),this.textareaLabel&&this.toolbar.setAttribute("aria-labelledby",this.textareaLabel.get("id")),this.setupToolbarNavigation(),this}},e.Base.mix(e.M.editor_atto.Editor,[c]),h.ATTRS={},h.prototype={_tabFocus:null,setupToolbarNavigation:function(){return this._wrapper.delegate("key",this.toolbarKeyboardNavigation,"down:37,39","."+r.TOOLBAR,this),this._wrapper.delegate("focus",function(e){this._setTabFocus(e.currentTarget)},"."+r.TOOLBAR+" button",this),this},toolbarKeyboardNavigation:function(e){e.preventDefault();var t=this.toolbar.all("button"),n=1,r,i=e.target.ancestor("button",!0);e.keyCode===37&&(n=-1),r=this._findFirstFocusable(t,i,n),r&&(r.focus(),this._setTabFocus(r))},_findFirstFocusable:function(e,t,n){var r=0,i,s,o,u;u=e.indexOf(t),u<-1&&(u=0);while(r<e.size()){u+=n,u<0?u=e.size()-1:u>=e.size()&&(u=0),s=e.item(u),r++;if(s.hasAttribute("hidden")||s.hasAttribute("disabled"))continue;i=s.ancestor(".atto_group");if(i.hasAttribute("hidden"))continue;o=s;break}return o},checkTabFocus:function(){return this._tabFocus&&(this._tabFocus.hasAttribute("disabled")||this._tabFocus.hasAttribute("hidden")||this._tabFocus.ancestor(".atto_group").hasAttribute("hidden"))&&(button=this._findFirstFocusable(this.toolbar.all("button"),this._tabFocus,-1),button&&(this._tabFocus.compareTo(document.activeElement)&&button.focus(),this._setTabFocus(button))),this},_setTabFocus:function(e){return this._tabFocus&&this._tabFocus.setAttribute("tabindex","-1"),this._tabFocus=e,this._tabFocus.setAttribute("tabindex",0),this.toolbar.setAttribute("aria-activedescendant",this._tabFocus.generateID()),this}},e.Base.mix(e.M.editor_atto.Editor,[h]),p.ATTRS={},p.prototype={_selections:null,_lastSelection:null,_focusFromClick:!1,setupSelectionWatchers:function(){return this.on("atto:selectionchanged",this.saveSelection,this),this.editor.on("focus",this.restoreSelection,this),this.editor.on("mousedown",function(){this._focusFromClick=!0},this),this.editor.on("blur",function(){this._focusFromClick=!1,this.updateOriginal()},this),e.delegate(["keyup","focus"],function(t){e.soon(e.bind(this._hasSelectionChanged,this,t))},document.body,"#"+this.editor.get("id"),this),e.delegate("gesturemoveend",function(t){e.soon(e.bind(this._hasSelectionChanged,this,t))},document.body,"#"+this.editor.get("id"),{standAlone:!0},this),this},isActive:function(){var t=rangy.createRange(),n=rangy
-.getSelection();return n.rangeCount?!document.activeElement||e.one(document.activeElement)!==this.editor?!1:(t.selectNode(this.editor.getDOMNode()),t.intersectsRange(n.getRangeAt(0))):!1},getSelectionFromNode:function(e){var t=rangy.createRange();return t.selectNode(e.getDOMNode()),[t]},saveSelection:function(){this.isActive()&&(this._selections=this.getSelection())},restoreSelection:function(){this._focusFromClick||this._selections&&this.setSelection(this._selections),this._focusFromClick=!1},getSelection:function(){return rangy.getSelection().getAllRanges()},selectionContainsNode:function(e){return rangy.getSelection().containsNode(e.getDOMNode(),!0)},selectionFilterMatches:function(e,t,n){typeof n=="undefined"&&(n=!0),t||(t=this.getSelectedNodes());var r=t.size()>0,i=!1,s=this.editor,o=function(e){return e===s};return s.one(e)?(t.each(function(t){if(n){if(!r||!t.ancestor(e,!0,o))r=!1}else!i&&t.ancestor(e,!0,o)&&(i=!0)},this),n?r:i):!1},getSelectedNodes:function(){var t=new e.NodeList,n,r,i,s,o;r=rangy.getSelection(),r.rangeCount?i=r.getRangeAt(0):i=rangy.createRange(),i.collapsed&&i.commonAncestorContainer!==this.editor.getDOMNode()&&i.commonAncestorContainer!==e.config.doc&&(i=i.cloneRange(),i.selectNode(i.commonAncestorContainer)),n=i.getNodes();for(o=0;o<n.length;o++)s=e.one(n[o]),this.editor.contains(s)&&t.push(s);return t},_hasSelectionChanged:function(e){var t=rangy.getSelection(),n,r=!1;return t.rangeCount?n=t.getRangeAt(0):n=rangy.createRange(),this._lastSelection&&!this._lastSelection.equals(n)?(r=!0,this._fireSelectionChanged(e)):(this._lastSelection=n,r)},_fireSelectionChanged:function(e){this.fire("atto:selectionchanged",{event:e,selectedNodes:this.getSelectedNodes()})},getSelectionParentNode:function(){var e=rangy.getSelection();return e.rangeCount?e.getRangeAt(0).commonAncestorContainer:!1},setSelection:function(e){var t=rangy.getSelection();t.setRanges(e)},insertContentAtFocusPoint:function(t){var n=rangy.getSelection(),r,i=e.Node.create(t);n.rangeCount&&(r=n.getRangeAt(0)),r&&(r.deleteContents(),r.insertNode(i.getDOMNode()))}},e.Base.mix(e.M.editor_atto.Editor,[p]),d.ATTRS={},d.prototype={disableCssStyling: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){}}}},enableCssStyling: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){}}}},toggleInlineSelectionClass:function(e){var t=e.join(" "),n=this.getSelection(),r=rangy.createCssClassApplier(t,{normalize:!0});r.toggleSelection(),this.setSelection(n)},formatSelectionInlineStyle:function(e){var t=this.PLACEHOLDER_CLASS,n=this.getSelection(),r=rangy.createCssClassApplier(t,{normalize:!0});r.applyToSelection(),this.editor.all("."+t).each(function(n){n.removeClass(t).setStyles(e)},this),this.setSelection(n)},formatSelectionBlock:function(t,n){var r=this.getSelectionParentNode(),i,s,o,u,a,f;if(!r)return!1;i=this.editor,r=e.one(r),s=r.ancestor(function(e){var t=e.get("tagName");return t&&(t=t.toLowerCase()),e===i||t==="td"||t==="th"},!0),s&&(i=s),o=r.ancestor(this.BLOCK_TAGS.join(", "),!0),o&&(a=o.ancestor(function(e){return e===i},!1),a||(o=!1)),o||(u=e.Node.create("<p></p>"),i.get("childNodes").each(function(e){u.append(e.remove())}),i.append(u),o=u),t&&t!==""&&(f=e.Node.create("<"+t+"></"+t+">"),f.setAttrs(o.getAttrs()),o.get("childNodes").each(function(e){e.remove(),f.append(e)}),o.replace(f),o=f),n&&o.setAttrs(n);var l=this.getSelectionFromNode(o);return this.setSelection(l),o}},e.Base.mix(e.M.editor_atto.Editor,[d]),v.ATTRS={filepickeroptions:{value:{}}},v.prototype={canShowFilepicker:function(e){return typeof this.get("filepickeroptions")[e]!="undefined"},showFilepicker:function(t,n,r){var i=this;e.use("core_filepicker",function(e){var s=e.clone(i.get("filepickeroptions")[t],!0);s.formcallback=n,r&&(s.magicscope=r),M.core_filepicker.show(e,s)})}},e.Base.mix(e.M.editor_atto.Editor,[v])},"@VERSION@",{requires:["node","io","overlay","escape","event","event-simulate","event-custom","yui-throttle","moodle-core-notification-dialogue","moodle-core-notification-confirm","moodle-editor_atto-rangy","handlebars","timers"]});
+YUI.add("moodle-editor_atto-editor",function(e,t){function i(){i.superclass.constructor.apply(this,arguments)}function a(){}function f(){}function p(){}function d(){}function v(){}function m(){}function g(){}function y(){}function b(){}var n="moodle-editor_atto-editor",r={CONTENT:"editor_atto_content",CONTENTWRAPPER:"editor_atto_content_wrap",TOOLBAR:"editor_atto_toolbar",WRAPPER:"editor_atto",HIGHLIGHT:"highlight"};e.extend(i,e.Base,{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_CLASS:"atto-tmp-class",ALL_NODES_SELECTOR:"[style],font[face]",FONT_FAMILY:"fontFamily",_wrapper:null,editor:null,textarea:null,textareaLabel:null,plugins:null,_eventHandles:null,initializer:function(){var t;this.textarea=e.one(document.getElementById(this.get("elementid")));if(!this.textarea)return;this._eventHandles=[],this._wrapper=e.Node.create('<div class="'+r.WRAPPER+'" />'),t=e.Handlebars.compile('<div id="{{elementid}}editable" contenteditable="true" role="textbox" spellcheck="true" aria-live="off" class="{{CSS.CONTENT}}" />'),this.editor=e.Node.create(t({elementid:this.get("elementid"),CSS:r})),this.textareaLabel=e.one('[for="'+this.get("elementid")+'"]'),this.textareaLabel&&(this.textareaLabel.generateID(),this.editor.setAttribute("aria-labelledby",this.textareaLabel.get("id"))),this.setupToolbar();var n=e.Node.create('<div class="'+r.CONTENTWRAPPER+'" />');n.appendChild(this.editor),this._wrapper.appendChild(n),this.editor.setStyle("minHeight",20*this.textarea.getAttribute("rows")+8+"px"),e.UA.ie===0&&this.editor.setStyle("height",20*this.textarea.getAttribute("rows")+8+"px"),this.disableCssStyling(),document.queryCommandSupported("DefaultParagraphSeparator")&&document.execCommand("DefaultParagraphSeparator",!1,"p"),this.textarea.get("parentNode").insert(this._wrapper,this.textarea),this.textarea.hide(),this.updateFromTextArea(),this.publishEvents(),this.setupSelectionWatchers(),this.setupAutomaticPolling(),this.setupPlugins(),this.setupAutosave(),this.setupNotifications()},focus:function(){return this.editor.focus(),this},publishEvents:function(){return this.publish("change",{broadcast:!0,preventable:!0}),this.publish("pluginsloaded",{fireOnce:!0}),this.publish("atto:selectionchanged",{prefix:"atto"}),this},setupAutomaticPolling:function(){return this._registerEventHandle(this.editor.on(["keyup","paste","cut"],this.updateOriginal,this)),this},setupPlugins:function(){this.plugins={};var t=this.get("plugins"),n,r,i,s,o;for(n in t){r=t[n];if(!r.plugins)continue;for(i in r.plugins){s=r.plugins[i],o=e.mix({name:s.name,group:r.group,editor:this.editor,toolbar:this.toolbar,host:this},s);if(typeof e.M["atto_"+s.name]=="undefined")continue;this.plugins[s.name]=new e.M["atto_"+s.name].Button(o)}}return this.fire("pluginsloaded"),this},enablePlugins:function(e){this._setPluginState(!0,e)},disablePlugins:function(e){this._setPluginState(!1,e)},_setPluginState:function(t,n){var r="disableButtons";t&&(r="enableButtons"),n?this.plugins[n][r]():e.Object.each(this.plugins,function(e){e[r]()},this)},_registerEventHandle:function(e){this._eventHandles.push(e)}},{NS:"editor_atto",ATTRS:{elementid:{value:null,writeOnce:!0},contextid:{value:null,writeOnce:!0},plugins:{value:{},writeOnce:!0}}}),e.augment(i,e.EventTarget),e.namespace("M.editor_atto").Editor=i,e.namespace("M.editor_atto.Editor").init=function(t){return new e.M.editor_atto.Editor(t)};var s="moodle-editor_atto-editor-notify",o="info",u="warning";a.ATTRS={},a.prototype={messageOverlay:null,hideTimer:null,setupNotifications:function(){var e=new Image,t=new Image;return e.src=M.util.image_url("i/warning","moodle"),t.src=M.util.image_url("i/info","moodle"),this},showMessage:function(t,n,r){var i="",s,a;return this.messageOverlay===null&&(this.messageOverlay=e.Node.create('<div class="editor_atto_notification"></div>'),this.messageOverlay.hide(),this._wrapper.append(this.messageOverlay),this.messageOverlay.on("click",function(){this.messageOverlay.hide()},this)),this.hideTimer!==null&&this.hideTimer.cancel(),n===u?i='<img src="'+M.util.image_url("i/warning","moodle")+'" alt="'+M.util.get_string("warning","moodle")+'"/>':n===o&&(i='<img src="'+M.util.image_url("i/info","moodle")+'" alt="'+M.util.get_string("info","moodle")+'"/>'),s=parseInt(r,10),s<=0&&(s=6e4),n="atto_"+n,a=e.Node.create('<div class="'+n+'" role="alert" aria-live="assertive">'+i+" "+e.Escape.html(t)+"</div>"),this.messageOverlay.empty(),this.messageOverlay.append(a),this.messageOverlay.show(),this.hideTimer=e.later(s,this,function(){this.hideTimer=null,this.messageOverlay.hide()}),this}},e.Base.mix(e.M.editor_atto.Editor,[a]),f.ATTRS={},f.prototype={_getEmptyContent:function(){return e.UA.ie&&e.UA.ie<10?"<p></p>":"<p><br></p>"},updateFromTextArea:function(){this.editor.setHTML(""),this.editor.append(this.textarea.get("value")),this.cleanEditorHTML(),this.editor.getHTML()===""&&this.editor.setHTML(this._getEmptyContent())},updateOriginal:function(){var e=this.textarea.get("value"),t=this.getCleanHTML();return t===""&&this.isActive()&&(t=this._getEmptyContent()),e!==t&&(this.textarea.set("value",t),this.textarea.simulate("change"),this.fire("change")),this}},e.Base.mix(e.M.editor_atto.Editor,[f]);var l=5e3,c=6e4,h="moodle-editor_atto-editor-autosave";p.ATTRS={autosaveEnabled:{value:!0,writeOnce:!0},autosaveFrequency:{value:60,writeOnce:!0}},p.prototype={lastText:null,autosaveInstance:null,setupAutosave:function(){var t=-1,n=null,r=this.get("filepickeroptions");if(!this.get("autosaveEnabled"))return;this.autosaveInstance=e.stamp(this);for(n in r)typeof r[n].itemid!="undefined"&&(t=r[n].itemid);url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"resume",drafttext:"",draftid:t,elementid:this.get("elementid"),
+pageinstance:this.autosaveInstance,pagedomid:e.one("body").get("id")},e.io(url,{method:"POST",data:params,context:this,on:{success:function(e,t){typeof t.responseText!="undefined"&&t.responseText!==""&&t.responseText!==this.textarea.get("value")&&this.recoverText(t.responseText)}}});var i=parseInt(this.get("autosaveFrequency"),10)*1e3;return e.later(i,this,this.saveDraft,!1,!0),this.textarea.ancestor("form").on("submit",this.resetAutosave,this),this},resetAutosave:function(){return url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"reset",elementid:this.get("elementid"),pageinstance:this.autosaveInstance,pagedomid:e.one("body").get("id")},e.io(url,{method:"POST",data:params,sync:!0}),this},recoverText:function(e){return this.editor.setHTML(e),this.saveSelection(),this.updateOriginal(),this.lastText=e,this.showMessage(M.util.get_string("textrecovered","editor_atto"),o,c),this},saveDraft:function(){this.updateOriginal();var t=this.textarea.get("value");if(t!==this.lastText){url=M.cfg.wwwroot+"/lib/editor/atto/autosave-ajax.php",params={sesskey:M.cfg.sesskey,contextid:this.get("contextid"),action:"save",drafttext:t,elementid:this.get("elementid"),pagedomid:e.one("body").get("id"),pageinstance:this.autosaveInstance};var n=function(e,t){var n=parseInt(this.get("autosaveFrequency"),10)*1e3;this.showMessage(M.util.get_string("autosavefailed","editor_atto"),u,n)};e.io(url,{method:"POST",data:params,context:this,on:{error:n,failure:n,success:function(e,r){r.response!==""?n(e,r):(this.lastText=t,this.showMessage(M.util.get_string("autosavesucceeded","editor_atto"),o,l))}}})}return this}},e.Base.mix(e.M.editor_atto.Editor,[p]),d.ATTRS={},d.prototype={getCleanHTML:function(){var t=this.editor.cloneNode(!0),n;return e.each(t.all('[id^="yui"]'),function(e){e.removeAttribute("id")}),t.all(".atto_control").remove(!0),n=t.get("innerHTML"),n==="<p></p>"||n==="<p><br></p>"?"":this._cleanHTML(n)},cleanEditorHTML:function(){var e=this.editor.get("innerHTML");return this.editor.set("innerHTML",this._cleanHTML(e)),this},_cleanHTML:function(e){var 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;for(n=0;n<t.length;n++)e=e.replace(t[n].regex,t[n].replace);return e}},e.Base.mix(e.M.editor_atto.Editor,[d]),v.ATTRS={},v.prototype={toolbar:null,openMenus:null,setupToolbar:function(){return this.toolbar=e.Node.create('<div class="'+r.TOOLBAR+'" role="toolbar" aria-live="off"/>'),this.openMenus=[],this._wrapper.appendChild(this.toolbar),this.textareaLabel&&this.toolbar.setAttribute("aria-labelledby",this.textareaLabel.get("id")),this.setupToolbarNavigation(),this}},e.Base.mix(e.M.editor_atto.Editor,[v]),m.ATTRS={},m.prototype={_tabFocus:null,setupToolbarNavigation:function(){return this._wrapper.delegate("key",this.toolbarKeyboardNavigation,"down:37,39","."+r.TOOLBAR,this),this._wrapper.delegate("focus",function(e){this._setTabFocus(e.currentTarget)},"."+r.TOOLBAR+" button",this),this},toolbarKeyboardNavigation:function(e){e.preventDefault();var t=this.toolbar.all("button"),n=1,r,i=e.target.ancestor("button",!0);e.keyCode===37&&(n=-1),r=this._findFirstFocusable(t,i,n),r&&(r.focus(),this._setTabFocus(r))},_findFirstFocusable:function(e,t,n){var r=0,i,s,o,u;u=e.indexOf(t),u<-1&&(u=0);while(r<e.size()){u+=n,u<0?u=e.size()-1:u>=e.size()&&(u=0),s=e.item(u),r++;if(s.hasAttribute("hidden")||s.hasAttribute("disabled"))continue;i=s.ancestor(".atto_group");if(i.hasAttribute("hidden"))continue;o=s;break}return o},checkTabFocus:function(){return this._tabFocus&&(this._tabFocus.hasAttribute("disabled")||this._tabFocus.hasAttribute("hidden")||this._tabFocus.ancestor(".atto_group").hasAttribute("hidden"))&&(button=this._findFirstFocusable(this.toolbar.all("button"),this._tabFocus,-1),button&&(this._tabFocus.compareTo(document.activeElement)&&button.focus(),this._setTabFocus(button))),this},_setTabFocus:function(e){return this._tabFocus&&this._tabFocus.setAttribute("tabindex","-1"),this._tabFocus=e,this._tabFocus.setAttribute("tabindex",0),this.toolbar.setAttribute("aria-activedescendant",this._tabFocus.generateID()),this}},e.Base.mix(e.M.editor_atto.Editor,[m]),g.ATTRS={},g.prototype={_selections:null,_lastSelection:null,_focusFromClick:!1,setupSelectionWatchers:function(){return this.on("atto:selectionchanged",this.saveSelection,this),this.editor.on("focus",this.restoreSelection,this),this.editor.on("mousedown",function(){this._focusFromClick=!0},this),this.editor.on("blur",function(){this._focusFromClick=!1,this.updateOriginal()},this),e.delegate(["keyup","focus"],function(t){e.soon(e.bind(this._hasSelectionChanged,this,t))},document.body,"#"+this.editor.get("id"),this),e.delegate("gesturemoveend",function(t){e.soon(e.bind(this._hasSelectionChanged,this,t))},document.body,"#"+this.editor.get("id"),{standAlone:!0},this),this},isActive:function(){var t=rangy.createRange(),n=rangy.getSelection();return n.rangeCount?!document.activeElement||e.one(document.activeElement
+)!==this.editor?!1:(t.selectNode(this.editor.getDOMNode()),t.intersectsRange(n.getRangeAt(0))):!1},getSelectionFromNode:function(e){var t=rangy.createRange();return t.selectNode(e.getDOMNode()),[t]},saveSelection:function(){this.isActive()&&(this._selections=this.getSelection())},restoreSelection:function(){this._focusFromClick||this._selections&&this.setSelection(this._selections),this._focusFromClick=!1},getSelection:function(){return rangy.getSelection().getAllRanges()},selectionContainsNode:function(e){return rangy.getSelection().containsNode(e.getDOMNode(),!0)},selectionFilterMatches:function(e,t,n){typeof n=="undefined"&&(n=!0),t||(t=this.getSelectedNodes());var r=t.size()>0,i=!1,s=this.editor,o=function(e){return e===s};return s.one(e)?(t.each(function(t){if(n){if(!r||!t.ancestor(e,!0,o))r=!1}else!i&&t.ancestor(e,!0,o)&&(i=!0)},this),n?r:i):!1},getSelectedNodes:function(){var t=new e.NodeList,n,r,i,s,o;r=rangy.getSelection(),r.rangeCount?i=r.getRangeAt(0):i=rangy.createRange(),i.collapsed&&i.commonAncestorContainer!==this.editor.getDOMNode()&&i.commonAncestorContainer!==e.config.doc&&(i=i.cloneRange(),i.selectNode(i.commonAncestorContainer)),n=i.getNodes();for(o=0;o<n.length;o++)s=e.one(n[o]),this.editor.contains(s)&&t.push(s);return t},_hasSelectionChanged:function(e){var t=rangy.getSelection(),n,r=!1;return t.rangeCount?n=t.getRangeAt(0):n=rangy.createRange(),this._lastSelection&&!this._lastSelection.equals(n)?(r=!0,this._fireSelectionChanged(e)):(this._lastSelection=n,r)},_fireSelectionChanged:function(e){this.fire("atto:selectionchanged",{event:e,selectedNodes:this.getSelectedNodes()})},getSelectionParentNode:function(){var e=rangy.getSelection();return e.rangeCount?e.getRangeAt(0).commonAncestorContainer:!1},setSelection:function(e){var t=rangy.getSelection();t.setRanges(e)},insertContentAtFocusPoint:function(t){var n=rangy.getSelection(),r,i=e.Node.create(t);n.rangeCount&&(r=n.getRangeAt(0)),r&&(r.deleteContents(),r.insertNode(i.getDOMNode()))}},e.Base.mix(e.M.editor_atto.Editor,[g]),y.ATTRS={},y.prototype={disableCssStyling: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){}}}},enableCssStyling: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){}}}},toggleInlineSelectionClass:function(e){var t=e.join(" "),n=this.getSelection(),r=rangy.createCssClassApplier(t,{normalize:!0});r.toggleSelection(),this.setSelection(n)},formatSelectionInlineStyle:function(e){var t=this.PLACEHOLDER_CLASS,n=this.getSelection(),r=rangy.createCssClassApplier(t,{normalize:!0});r.applyToSelection(),this.editor.all("."+t).each(function(n){n.removeClass(t).setStyles(e)},this),this.setSelection(n)},formatSelectionBlock:function(t,n){var r=this.getSelectionParentNode(),i,s,o,u,a,f;if(!r)return!1;i=this.editor,r=e.one(r),s=r.ancestor(function(e){var t=e.get("tagName");return t&&(t=t.toLowerCase()),e===i||t==="td"||t==="th"},!0),s&&(i=s),o=r.ancestor(this.BLOCK_TAGS.join(", "),!0),o&&(a=o.ancestor(function(e){return e===i},!1),a||(o=!1)),o||(u=e.Node.create("<p></p>"),i.get("childNodes").each(function(e){u.append(e.remove())}),i.append(u),o=u),t&&t!==""&&(f=e.Node.create("<"+t+"></"+t+">"),f.setAttrs(o.getAttrs()),o.get("childNodes").each(function(e){e.remove(),f.append(e)}),o.replace(f),o=f),n&&o.setAttrs(n);var l=this.getSelectionFromNode(o);return this.setSelection(l),o}},e.Base.mix(e.M.editor_atto.Editor,[y]),b.ATTRS={filepickeroptions:{value:{}}},b.prototype={canShowFilepicker:function(e){return typeof this.get("filepickeroptions")[e]!="undefined"},showFilepicker:function(t,n,r){var i=this;e.use("core_filepicker",function(e){var s=e.clone(i.get("filepickeroptions")[t],!0);s.formcallback=n,r&&(s.magicscope=r),M.core_filepicker.show(e,s)})}},e.Base.mix(e.M.editor_atto.Editor,[b])},"@VERSION@",{requires:["node","io","overlay","escape","event","event-simulate","event-custom","yui-throttle","moodle-core-notification-dialogue","moodle-core-notification-confirm","moodle-editor_atto-rangy","handlebars","timers"]});
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 18bdb920723..1ccf8d8e466 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
@@ -469,12 +469,16 @@ Y.namespace('M.editor_atto.Editor').init = function(config) {
  * A notify function for the Atto editor.
  *
  * @module     moodle-editor_atto-notify
- * @submodule  notify-base
+ * @submodule  notify
  * @package    editor_atto
  * @copyright  2014 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+var LOGNAME_NOTIFY = 'moodle-editor_atto-editor-notify',
+    NOTIFY_INFO = 'info',
+    NOTIFY_WARNING = 'warning';
+
 function EditorNotify() {}
 
 EditorNotify.ATTRS= {
@@ -483,10 +487,10 @@ EditorNotify.ATTRS= {
 EditorNotify.prototype = {
 
     /**
-     * A single Y.Overlay for this editor. There is only ever one - it is replaced if a new message comes in.
+     * A single Y.Node for this editor. There is only ever one - it is replaced if a new message comes in.
      *
      * @property messageOverlay
-     * @type {Y.Overlay}
+     * @type {Node}
      */
     messageOverlay: null,
 
@@ -518,12 +522,15 @@ EditorNotify.prototype = {
      * Show a notification in a floaty overlay somewhere in the atto editor text area.
      *
      * @method showMessage
-     * @param {String} message - The translated message (use get_string)
-     * @param {String} type - Must be either "info" or "warning"
-     * @param {Integer} timeout - Time in milliseconds to show this message for.
+     * @param {String} message The translated message (use get_string)
+     * @param {String} type Must be either "info" or "warning"
+     * @param {Number} timeout Time in milliseconds to show this message for.
      * @chainable
      */
     showMessage: function(message, type, timeout) {
+        var messageTypeIcon = '',
+            intTimeout,
+            bodyContent;
 
         if (this.messageOverlay === null) {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
@@ -540,12 +547,11 @@ EditorNotify.prototype = {
             this.hideTimer.cancel();
         }
 
-        var messageTypeIcon = '';
-        if (type === "warning") {
+        if (type === NOTIFY_WARNING) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/warning', 'moodle') +
                               '" alt="' + M.util.get_string('warning', 'moodle') + '"/>';
-        } else if (type === "info") {
+        } else if (type === NOTIFY_INFO) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/info', 'moodle') +
                               '" alt="' + M.util.get_string('info', 'moodle') + '"/>';
@@ -553,15 +559,15 @@ EditorNotify.prototype = {
         }
 
         // Parse the timeout value.
-        var inttimeout = parseInt(timeout, 10);
-        if (inttimeout <= 0) {
-            inttimeout = 60000;
+        intTimeout = parseInt(timeout, 10);
+        if (intTimeout <= 0) {
+            intTimeout = 60000;
         }
 
         // Convert class to atto_info (for example).
         type = 'atto_' + type;
 
-        var bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
+        bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
                                         messageTypeIcon + ' ' +
                                         Y.Escape.html(message) +
                                         '</div>');
@@ -569,7 +575,7 @@ EditorNotify.prototype = {
         this.messageOverlay.append(bodyContent);
         this.messageOverlay.show();
 
-        this.hideTimer = Y.later(inttimeout, this, function() {
+        this.hideTimer = Y.later(intTimeout, this, function() {
             this.hideTimer = null;
             this.messageOverlay.hide();
         });
@@ -717,7 +723,8 @@ Y.Base.mix(Y.M.editor_atto.Editor, [EditorTextArea]);
  */
 
 var SUCCESS_MESSAGE_TIMEOUT = 5000,
-    RECOVER_MESSAGE_TIMEOUT = 60000;
+    RECOVER_MESSAGE_TIMEOUT = 60000,
+    LOGNAME_AUTOSAVE = 'moodle-editor_atto-editor-autosave';
 
 function EditorAutosave() {}
 
@@ -738,7 +745,7 @@ EditorAutosave.ATTRS= {
      * The time between autosaves (in seconds).
      *
      * @attribute autosaveFrequency
-     * @type Integer
+     * @type Number
      * @default 60
      * @writeOnce
      */
@@ -806,6 +813,7 @@ EditorAutosave.prototype = {
         Y.io(url, {
             method: 'POST',
             data: params,
+            context: this,
             on: {
                 success: function(id,o) {
                     if (typeof o.responseText !== "undefined" &&
@@ -814,8 +822,7 @@ EditorAutosave.prototype = {
                         this.recoverText(o.responseText);
                     }
                 }
-            },
-            context: this
+            }
         });
 
         // Now setup the timer for periodic saves.
@@ -846,7 +853,6 @@ EditorAutosave.prototype = {
             pagedomid: Y.one('body').get('id')
         };
 
-        // We don't even wait!
         Y.io(url, {
             method: 'POST',
             data: params,
@@ -869,7 +875,7 @@ EditorAutosave.prototype = {
         this.updateOriginal();
         this.lastText = text;
 
-        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), 'info', RECOVER_MESSAGE_TIMEOUT);
+        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), NOTIFY_INFO, RECOVER_MESSAGE_TIMEOUT);
 
         return this;
     },
@@ -897,29 +903,30 @@ EditorAutosave.prototype = {
                 pagedomid: Y.one('body').get('id'),
                 pageinstance: this.autosaveInstance
             };
-            var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+
+            // Reusable error handler - must be passed the correct context.
+            var ajaxErrorFunction = function(code, response) {
+                var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+                this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), NOTIFY_WARNING, errorDuration);
+            };
 
             Y.io(url, {
                 method: 'POST',
                 data: params,
+                context: this,
                 on: {
-                    error: function(code, response) {
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
-                    failure: function(code, response) {
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
+                    error: ajaxErrorFunction,
+                    failure: ajaxErrorFunction,
                     success: function(code, response) {
                         if (response.response !== "") {
-                            this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
+                            ajaxErrorFunction(code, response);
                         } else {
                             // All working.
                             this.lastText = newText;
-                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), 'info', SUCCESS_MESSAGE_TIMEOUT);
+                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), NOTIFY_INFO, SUCCESS_MESSAGE_TIMEOUT);
                         }
                     }
-                },
-                context: this
+                }
             });
         }
         return this;
diff --git a/lib/editor/atto/yui/src/editor/js/autosave.js b/lib/editor/atto/yui/src/editor/js/autosave.js
index 0f6f4454a70..932783ca38c 100644
--- a/lib/editor/atto/yui/src/editor/js/autosave.js
+++ b/lib/editor/atto/yui/src/editor/js/autosave.js
@@ -24,7 +24,8 @@
  */
 
 var SUCCESS_MESSAGE_TIMEOUT = 5000,
-    RECOVER_MESSAGE_TIMEOUT = 60000;
+    RECOVER_MESSAGE_TIMEOUT = 60000,
+    LOGNAME_AUTOSAVE = 'moodle-editor_atto-editor-autosave';
 
 function EditorAutosave() {}
 
@@ -45,7 +46,7 @@ EditorAutosave.ATTRS= {
      * The time between autosaves (in seconds).
      *
      * @attribute autosaveFrequency
-     * @type Integer
+     * @type Number
      * @default 60
      * @writeOnce
      */
@@ -113,22 +114,21 @@ EditorAutosave.prototype = {
         Y.io(url, {
             method: 'POST',
             data: params,
+            context: this,
             on: {
                 success: function(id,o) {
                     if (typeof o.responseText !== "undefined" &&
                         o.responseText !== "" &&
                         o.responseText !== this.textarea.get('value')) {
-                        Y.log('Autosave text found - confirm recovery.');
+                        Y.log('Autosave text found - confirm recovery.', 'debug', LOGNAME_AUTOSAVE);
                         this.recoverText(o.responseText);
                     }
                 }
-            },
-            context: this
+            }
         });
 
         // Now setup the timer for periodic saves.
 
-        Y.log(this.get('autosaveFrequency'));
         var delay = parseInt(this.get('autosaveFrequency'), 10) * 1000;
         Y.later(delay, this, this.saveDraft, false, true);
 
@@ -155,7 +155,6 @@ EditorAutosave.prototype = {
             pagedomid: Y.one('body').get('id')
         };
 
-        // We don't even wait!
         Y.io(url, {
             method: 'POST',
             data: params,
@@ -178,7 +177,7 @@ EditorAutosave.prototype = {
         this.updateOriginal();
         this.lastText = text;
 
-        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), 'info', RECOVER_MESSAGE_TIMEOUT);
+        this.showMessage(M.util.get_string('textrecovered', 'editor_atto'), NOTIFY_INFO, RECOVER_MESSAGE_TIMEOUT);
 
         return this;
     },
@@ -194,7 +193,7 @@ EditorAutosave.prototype = {
         var newText = this.textarea.get('value');
 
         if (newText !== this.lastText) {
-            Y.log('Autosave text');
+            Y.log('Autosave text', 'debug', LOGNAME_AUTOSAVE);
 
             // Make an ajax request.
             url = M.cfg.wwwroot + '/lib/editor/atto/autosave-ajax.php';
@@ -207,35 +206,32 @@ EditorAutosave.prototype = {
                 pagedomid: Y.one('body').get('id'),
                 pageinstance: this.autosaveInstance
             };
-            var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+
+            // Reusable error handler - must be passed the correct context.
+            var ajaxErrorFunction = function(code, response) {
+                var errorDuration = parseInt(this.get('autosaveFrequency'), 10) * 1000;
+                Y.log('Error while autosaving text:' + code, 'warn', LOGNAME_AUTOSAVE);
+                Y.log(response, 'warn', LOGNAME_AUTOSAVE);
+                this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), NOTIFY_WARNING, errorDuration);
+            };
 
             Y.io(url, {
                 method: 'POST',
                 data: params,
+                context: this,
                 on: {
-                    error: function(code, response) {
-                        Y.log('Error while autosaving text:' + code, 'warn');
-                        Y.log(response, 'warn');
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
-                    failure: function(code, response) {
-                        Y.log('Failure while autosaving text:' + code, 'warn');
-                        Y.log(response, 'warn');
-                        this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
-                    },
+                    error: ajaxErrorFunction,
+                    failure: ajaxErrorFunction,
                     success: function(code, response) {
                         if (response.response !== "") {
-                            Y.log('Failure while autosaving text.', 'warn');
-                            Y.log(response, 'debug');
-                            this.showMessage(M.util.get_string('autosavefailed', 'editor_atto'), 'warning', errorDuration);
+                            ajaxErrorFunction(code, response);
                         } else {
                             // All working.
                             this.lastText = newText;
-                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), 'info', SUCCESS_MESSAGE_TIMEOUT);
+                            this.showMessage(M.util.get_string('autosavesucceeded', 'editor_atto'), NOTIFY_INFO, SUCCESS_MESSAGE_TIMEOUT);
                         }
                     }
-                },
-                context: this
+                }
             });
         }
         return this;
diff --git a/lib/editor/atto/yui/src/editor/js/notify.js b/lib/editor/atto/yui/src/editor/js/notify.js
index 1b29a3e1249..425b562fcaf 100644
--- a/lib/editor/atto/yui/src/editor/js/notify.js
+++ b/lib/editor/atto/yui/src/editor/js/notify.js
@@ -17,12 +17,16 @@
  * A notify function for the Atto editor.
  *
  * @module     moodle-editor_atto-notify
- * @submodule  notify-base
+ * @submodule  notify
  * @package    editor_atto
  * @copyright  2014 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+var LOGNAME_NOTIFY = 'moodle-editor_atto-editor-notify',
+    NOTIFY_INFO = 'info',
+    NOTIFY_WARNING = 'warning';
+
 function EditorNotify() {}
 
 EditorNotify.ATTRS= {
@@ -31,10 +35,10 @@ EditorNotify.ATTRS= {
 EditorNotify.prototype = {
 
     /**
-     * A single Y.Overlay for this editor. There is only ever one - it is replaced if a new message comes in.
+     * A single Y.Node for this editor. There is only ever one - it is replaced if a new message comes in.
      *
      * @property messageOverlay
-     * @type {Y.Overlay}
+     * @type {Node}
      */
     messageOverlay: null,
 
@@ -66,12 +70,15 @@ EditorNotify.prototype = {
      * Show a notification in a floaty overlay somewhere in the atto editor text area.
      *
      * @method showMessage
-     * @param {String} message - The translated message (use get_string)
-     * @param {String} type - Must be either "info" or "warning"
-     * @param {Integer} timeout - Time in milliseconds to show this message for.
+     * @param {String} message The translated message (use get_string)
+     * @param {String} type Must be either "info" or "warning"
+     * @param {Number} timeout Time in milliseconds to show this message for.
      * @chainable
      */
     showMessage: function(message, type, timeout) {
+        var messageTypeIcon = '',
+            intTimeout,
+            bodyContent;
 
         if (this.messageOverlay === null) {
             this.messageOverlay = Y.Node.create('<div class="editor_atto_notification"></div>');
@@ -88,29 +95,28 @@ EditorNotify.prototype = {
             this.hideTimer.cancel();
         }
 
-        var messageTypeIcon = '';
-        if (type === "warning") {
+        if (type === NOTIFY_WARNING) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/warning', 'moodle') +
                               '" alt="' + M.util.get_string('warning', 'moodle') + '"/>';
-        } else if (type === "info") {
+        } else if (type === NOTIFY_INFO) {
             messageTypeIcon = '<img src="' +
                               M.util.image_url('i/info', 'moodle') +
                               '" alt="' + M.util.get_string('info', 'moodle') + '"/>';
         } else {
-            Y.log('Invalid message type specified: ' + type + '. Must be either "info" or "warning".', 'debug');
+            Y.log('Invalid message type specified: ' + type + '. Must be either "info" or "warning".', 'debug', LOGNAME_NOTIFY);
         }
 
         // Parse the timeout value.
-        var inttimeout = parseInt(timeout, 10);
-        if (inttimeout <= 0) {
-            inttimeout = 60000;
+        intTimeout = parseInt(timeout, 10);
+        if (intTimeout <= 0) {
+            intTimeout = 60000;
         }
 
         // Convert class to atto_info (for example).
         type = 'atto_' + type;
 
-        var bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
+        bodyContent = Y.Node.create('<div class="' + type + '" role="alert" aria-live="assertive">' +
                                         messageTypeIcon + ' ' +
                                         Y.Escape.html(message) +
                                         '</div>');
@@ -118,8 +124,8 @@ EditorNotify.prototype = {
         this.messageOverlay.append(bodyContent);
         this.messageOverlay.show();
 
-        this.hideTimer = Y.later(inttimeout, this, function() {
-            Y.log('Hide Atto notification.', 'debug');
+        this.hideTimer = Y.later(intTimeout, this, function() {
+            Y.log('Hide Atto notification.', 'debug', LOGNAME_NOTIFY);
             this.hideTimer = null;
             this.messageOverlay.hide();
         });