summaryrefslogtreecommitdiff
path: root/public/vendor/inlineAttachment
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-01-23 12:10:33 +0100
committerGitHub2018-01-23 12:10:33 +0100
commit584f1c524904147df41d642db6303a13c968e6d1 (patch)
tree07f4cda1da15e214801138ea80581f7ec9e1e94f /public/vendor/inlineAttachment
parente0389bc4cf21da4dac0f42b9f2a6d3cdf5b0d669 (diff)
parenta7935a595a6d482aaefb5a3c9fa0600adf2d2c5b (diff)
Merge pull request #691 from SISheogorath/feature/upload
Allow more detailed configuration of upload mime types
Diffstat (limited to 'public/vendor/inlineAttachment')
-rw-r--r--public/vendor/inlineAttachment/inline-attachment.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/public/vendor/inlineAttachment/inline-attachment.js b/public/vendor/inlineAttachment/inline-attachment.js
index 0ffd3f9f..d9503d62 100644
--- a/public/vendor/inlineAttachment/inline-attachment.js
+++ b/public/vendor/inlineAttachment/inline-attachment.js
@@ -141,12 +141,7 @@
/**
* Allowed MIME types
*/
- allowedTypes: [
- 'image/jpeg',
- 'image/png',
- 'image/jpg',
- 'image/gif'
- ],
+ allowedTypes: window.allowedUploadMimeTypes,
/**
* Text which will be inserted when dropping or pasting a file.
@@ -304,7 +299,7 @@
if (this.settings.onFileUploadResponse.call(this, xhr) !== false) {
var result = JSON.parse(xhr.responseText),
filename = result[this.settings.jsonFieldName];
-
+
if (result && filename) {
var replacements = [];
var string = this.settings.progressText.replace(this.filenameTag, id);
@@ -415,7 +410,7 @@
// <http://wiki.ecmascript.org/doku.php?id=strawman:names>.
//
// The goals of this function are twofold:
-//
+//
// * Provide a way to generate a string guaranteed to be unique when compared
// to other strings generated by this function.
// * Make the string complex enough that it is highly unlikely to be
@@ -432,4 +427,4 @@ var ID = function () {
// Convert it to base 36 (numbers + letters), and grab the first 9 characters
// after the decimal.
return '_' + Math.random().toString(36).substr(2, 9);
-}; \ No newline at end of file
+};