Merge remote-tracking branch 'origin/griffin'

Author: makmentins

scripts/h5peditor-file-uploader.js

@@ -20,13 +20,31 @@ H5PEditor.FileUploader = (function ($, EventDispatcher) {
      * @param {string} filename Required due to validation
      */
     self.upload = function (file, filename, context = {}) {
+      if (file.size > 2147483648) { // file bigger than 2 GB
+        var uploadComplete = {
+          ...context,
+          error: H5PEditor.t('core', 'fileToLarge'),
+          data: null
+        };
+        self.trigger('uploadComplete', uploadComplete);
+        return;
+      }
+      
       var formData = new FormData();
       formData.append('file', file, filename);
       formData.append('field', JSON.stringify(field));
       formData.append('contentId', H5PEditor.contentId || 0);
 
       // Submit the form
       var request = new XMLHttpRequest();
+      request.onerror = function () {
+        var uploadComplete = {
+          ...context,
+          error: H5PEditor.t('core', 'unknownFileUploadError'),
+          data: null
+        };
+        self.trigger('uploadComplete', uploadComplete);
+      }
       request.upload.onprogress = function (e) {
         if (e.lengthComputable) {
           self.trigger('uploadProgress', {