diff --git a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-debug.js b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-debug.js
index 110c2ce..129de4f 100644
--- a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-debug.js
+++ b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-debug.js
@@ -81,6 +81,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
         var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
         // @codingStandardsIgnoreLine
         if (handlesDataTransfer && !/^image\//.test(e.dataTransfer.files[0].type)) {
+            self.notifyUploadStarted();
             var options = host.get('filepickeroptions').link,
                 savepath = (options.savepath === undefined) ? '/' : options.savepath,
                 formData = new FormData(),
@@ -135,6 +136,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                                 if (placeholder) {
                                     placeholder.remove(true);
                                 }
+                                self.notifyUploadCompleted();
                                 return new M.core.ajaxException(result);
                             }
 
@@ -160,6 +162,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             self.markUpdated();
                         }
                     } else {
+                        self.notifyUploadCompleted();
                         Y.use('moodle-core-notification-alert', function() {
                             new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
                         });
@@ -167,12 +170,41 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             placeholder.remove(true);
                         }
                     }
+                    self.notifyUploadCompleted();
                 }
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
             return false;
         }
+    },
+
+    /**
+     * Trigger form upload complete events.
+     */
+     notifyUploadCompleted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadCompleted) !== "undefined") {
+                    FormEvent.triggerUploadCompleted(self.editor.get('id'));
+                }
+            });
+        }
+    },
+
+    /**
+     * Trigger form upload start events.
+     */
+     notifyUploadStarted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadStarted) !== "undefined") {
+                    FormEvent.triggerUploadStarted(self.editor.get('id'));
+                }
+            });
+        }
     }
 
 });
diff --git a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-min.js b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-min.js
index 2a9d856..1239ffb 100644
--- a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-min.js
+++ b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button-min.js
@@ -1 +1 @@
-YUI.add("moodle-atto_filedragdrop-button",function(e,t){var n="atto_filedragdrop",r='<a href="{{url}}" {{#if id}}id="{{id}}" {{/if}}>{{text}}',i='<img src="{{url}}" {{#if alt}}alt="{{alt}}" {{/if}} style="vertical-align:text-bottom;margin: 0 .5em;" class="img-responsive" {{#if presentation}}role="presentation" {{/if}}{{#if id}}id="{{id}}" {{/if}}/>';e.namespace("M.atto_filedragdrop").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,initializer:function(){this.editor.on("drop",this._handleDragDrop,this)},_handleDragDrop:function(t){var s=this,o=this.get("host"),u=e.Handlebars.compile(r),a=e.Handlebars.compile(i);o.saveSelection(),t=t._event;var f=t.dataTransfer&&t.dataTransfer.files&&t.dataTransfer.files.length;if(f&&!/^image\//.test(t.dataTransfer.files[0].type)){var l=o.get("filepickeroptions").link,c=l.savepath===undefined?"/":l.savepath,h=new FormData,p=0,d="",v=new XMLHttpRequest,m="",g=Object.keys(l.repositories);t.preventDefault(),t.stopPropagation(),h.append("repo_upload_file",t.dataTransfer.files[0]),h.append("itemid",l.itemid);for(var y=0;y<g.length;y++)if(l.repositories[g[y]].type==="upload"){h.append("repo_id",l.repositories[g[y]].id);break}return h.append("env",l.env),h.append("sesskey",M.cfg.sesskey),h.append("client_id",l.client_id),h.append("savepath",c),h.append("ctx_id",l.context.id),p=(new Date).getTime(),d="moodlefile_"+Math.round(Math.random()*1e5)+"-"+p,o.focus(),o.restoreSelection(),m=a({url:M.util.image_url("i/loading_small","moodle"),alt:M.util.get_string("uploading",n),id:d}),o.insertContentAtFocusPoint(m),s.markUpdated(),v.onreadystatechange=function(){var t=s.editor.one("#"+d),n,r,i,o;if(v.readyState===4)if(v.status===200){n=JSON.parse(v.responseText);if(n){if(n.error)return t&&t.remove(!0),new M.core.ajaxException(n);r=n,n.event&&n.event==="fileexists"&&(r=n.newfile),i=u({url:r.url,text:r.file||r.filename}),o=e.Node.create(i),t?t.replace(o):s.editor.appendChild(o),s.markUpdated()}}else e.use("moodle-core-notification-alert",function(){new M.core.alert({message:M.util.get_string("servererror","moodle")})}),t&&t.remove(!0)},v.open("POST",M.cfg.wwwroot+"/repository/repository_ajax.php?action=upload",!0),v.send(h),!1}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
+YUI.add("moodle-atto_filedragdrop-button",function(g,e){g.namespace("M.atto_filedragdrop").Button=g.Base.create("button",g.M.editor_atto.EditorPlugin,[],{_currentSelection:null,initializer:function(){this.editor.on("drop",this._handleDragDrop,this)},_handleDragDrop:function(e){var t,i,o,r,a,n,d,l,p,s=this,f=this.get("host"),u=g.Handlebars.compile('<a href="{{url}}" {{#if id}}id="{{id}}" {{/if}}>{{text}}'),c=g.Handlebars.compile('<img src="{{url}}" {{#if alt}}alt="{{alt}}" {{/if}} style="vertical-align:text-bottom;margin: 0 .5em;" class="img-responsive" {{#if presentation}}role="presentation" {{/if}}{{#if id}}id="{{id}}" {{/if}}/>');if(f.saveSelection(),(e=e._event).dataTransfer&&e.dataTransfer.files&&e.dataTransfer.files.length&&!/^image\//.test(e.dataTransfer.files[0].type)){for(s.notifyUploadStarted(),i=(t=f.get("filepickeroptions").link).savepath===undefined?"/":t.savepath,o=new FormData,r=0,a="",n=new XMLHttpRequest,d="",l=Object.keys(t.repositories),e.preventDefault(),e.stopPropagation(),o.append("repo_upload_file",e.dataTransfer.files[0]),o.append("itemid",t.itemid),p=0;p<l.length;p++)if("upload"===t.repositories[l[p]].type){o.append("repo_id",t.repositories[l[p]].id);break}return o.append("env",t.env),o.append("sesskey",M.cfg.sesskey),o.append("client_id",t.client_id),o.append("savepath",i),o.append("ctx_id",t.context.id),r=(new Date).getTime(),a="moodlefile_"+Math.round(1e5*Math.random())+"-"+r,f.focus(),f.restoreSelection(),d=c({url:M.util.image_url("i/loading_small","moodle"),alt:M.util.get_string("uploading","atto_filedragdrop"),id:a}),f.insertContentAtFocusPoint(d),s.markUpdated(),n.onreadystatechange=function(){var e,t,i,o,r=s.editor.one("#"+a);if(4===n.readyState){if(200===n.status){if(e=JSON.parse(n.responseText)){if(e.error)return r&&r.remove(!0),s.notifyUploadCompleted(),new M.core.ajaxException(e);(t=e).event&&"fileexists"===e.event&&(t=e.newfile),i=u({url:t.url,text:t.file||t.filename}),o=g.Node.create(i),r?r.replace(o):s.editor.appendChild(o),s.markUpdated()}}else s.notifyUploadCompleted(),g.use("moodle-core-notification-alert",function(){new M.core.alert({message:M.util.get_string("servererror","moodle")})}),r&&r.remove(!0);s.notifyUploadCompleted()}},n.open("POST",M.cfg.wwwroot+"/repository/repository_ajax.php?action=upload",!0),n.send(o),!1}},notifyUploadCompleted:function(){var t=this;require.specified("core_form/events")&&require(["core_form/events"],function(e){"undefined"!=typeof e.triggerUploadCompleted&&e.triggerUploadCompleted(t.editor.get("id"))})},notifyUploadStarted:function(){var t=this;require.specified("core_form/events")&&require(["core_form/events"],function(e){"undefined"!=typeof e.triggerUploadStarted&&e.triggerUploadStarted(t.editor.get("id"))})}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
\ No newline at end of file
diff --git a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button.js b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button.js
index 110c2ce..129de4f 100644
--- a/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button.js
+++ b/yui/build/moodle-atto_filedragdrop-button/moodle-atto_filedragdrop-button.js
@@ -81,6 +81,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
         var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
         // @codingStandardsIgnoreLine
         if (handlesDataTransfer && !/^image\//.test(e.dataTransfer.files[0].type)) {
+            self.notifyUploadStarted();
             var options = host.get('filepickeroptions').link,
                 savepath = (options.savepath === undefined) ? '/' : options.savepath,
                 formData = new FormData(),
@@ -135,6 +136,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                                 if (placeholder) {
                                     placeholder.remove(true);
                                 }
+                                self.notifyUploadCompleted();
                                 return new M.core.ajaxException(result);
                             }
 
@@ -160,6 +162,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             self.markUpdated();
                         }
                     } else {
+                        self.notifyUploadCompleted();
                         Y.use('moodle-core-notification-alert', function() {
                             new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
                         });
@@ -167,12 +170,41 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             placeholder.remove(true);
                         }
                     }
+                    self.notifyUploadCompleted();
                 }
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
             return false;
         }
+    },
+
+    /**
+     * Trigger form upload complete events.
+     */
+     notifyUploadCompleted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadCompleted) !== "undefined") {
+                    FormEvent.triggerUploadCompleted(self.editor.get('id'));
+                }
+            });
+        }
+    },
+
+    /**
+     * Trigger form upload start events.
+     */
+     notifyUploadStarted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadStarted) !== "undefined") {
+                    FormEvent.triggerUploadStarted(self.editor.get('id'));
+                }
+            });
+        }
     }
 
 });
diff --git a/yui/src/button/js/button.js b/yui/src/button/js/button.js
index 1e54b70..adba0dd 100644
--- a/yui/src/button/js/button.js
+++ b/yui/src/button/js/button.js
@@ -79,6 +79,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
         var handlesDataTransfer = (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length);
         // @codingStandardsIgnoreLine
         if (handlesDataTransfer && !/^image\//.test(e.dataTransfer.files[0].type)) {
+            self.notifyUploadStarted();
             var options = host.get('filepickeroptions').link,
                 savepath = (options.savepath === undefined) ? '/' : options.savepath,
                 formData = new FormData(),
@@ -133,6 +134,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                                 if (placeholder) {
                                     placeholder.remove(true);
                                 }
+                                self.notifyUploadCompleted();
                                 return new M.core.ajaxException(result);
                             }
 
@@ -158,6 +160,7 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             self.markUpdated();
                         }
                     } else {
+                        self.notifyUploadCompleted();
                         Y.use('moodle-core-notification-alert', function() {
                             new M.core.alert({message: M.util.get_string('servererror', 'moodle')});
                         });
@@ -165,12 +168,41 @@ Y.namespace('M.atto_filedragdrop').Button = Y.Base.create('button', Y.M.editor_a
                             placeholder.remove(true);
                         }
                     }
+                    self.notifyUploadCompleted();
                 }
             };
             xhr.open("POST", M.cfg.wwwroot + '/repository/repository_ajax.php?action=upload', true);
             xhr.send(formData);
             return false;
         }
+    },
+
+    /**
+     * Trigger form upload complete events.
+     */
+     notifyUploadCompleted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadCompleted) !== "undefined") {
+                    FormEvent.triggerUploadCompleted(self.editor.get('id'));
+                }
+            });
+        }
+    },
+
+    /**
+     * Trigger form upload start events.
+     */
+     notifyUploadStarted: function() {
+        var self = this;
+        if (require.specified('core_form/events')) {
+            require(['core_form/events'], function(FormEvent) {
+                if (typeof(FormEvent.triggerUploadStarted) !== "undefined") {
+                    FormEvent.triggerUploadStarted(self.editor.get('id'));
+                }
+            });
+        }
     }
 
 });