Merge pull request #772 from SISheogorath/fix/chromeFileError

Some fixes for inline-Attachments in Codemirror

1 files changed, 7 insertions, 4 deletions

diff --git a/public/vendor/inlineAttachment/inline-attachment.js b/public/vendor/inlineAttachment/inline-attachment.js
index d9503d62..5c7c7166 100644
--- a/public/vendor/inlineAttachment/inline-attachment.js
+++ b/public/vendor/inlineAttachment/inline-attachment.js
@@ -131,7 +131,7 @@
      * Extension which will be used when a file extension could not
      * be detected
      */
-    defualtExtension: 'png',
+    defaultExtension: 'png',
 
     /**
      * JSON field which refers to the uploaded file URL
@@ -220,7 +220,7 @@
       xhr = new XMLHttpRequest(),
       id = id,
       settings = this.settings,
-      extension = settings.defualtExtension;
+      extension = settings.defaultExtension;
 
     if (typeof settings.setupFormData === 'function') {
       settings.setupFormData(formData, file);
@@ -370,8 +370,11 @@
         if (this.isFileAllowed(item)) {
           result = true;
           var id = ID();
-          this.onFileInserted(item.getAsFile(), id);
-          this.uploadFile(item.getAsFile(), id);
+          var file = item.getAsFile();
+          if (file !== null) {
+            this.onFileInserted(file, id);
+            this.uploadFile(file, id);
+          }
         }
       }
     }