Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: properly detect when attachments are allowed

This commit is contained in:
Régis Hanol 2016-10-19 18:42:24 +02:00
parent c6ef1301f3
commit 9f7b529495
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -267,12 +267,12 @@ export function isAnImage(path) {
export function allowsImages() { export function allowsImages() {
return authorizesAllExtensions() || return authorizesAllExtensions() ||
(/(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i).test(authorizedExtensions()); (/\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)/i).test(authorizedExtensions());
} }
export function allowsAttachments() { export function allowsAttachments() {
return authorizesAllExtensions() || return authorizesAllExtensions() ||
!(/((png|jpe?g|gif|bmp|tiff?|svg|web|ico)(,\s)?)+$/i).test(authorizedExtensions()); !/^(\.(png|jpe?g|gif|bmp|tiff?|svg|webp|ico)(,\s)?)+$/i.test(authorizedExtensions());
} }
export function displayErrorForUpload(data) { export function displayErrorForUpload(data) {

6
test/javascripts/lib/utilities-test.js.es6
View File

@ -164,13 +164,13 @@ test("avatarImg", function() {
}); });
test("allowsAttachments", function() { test("allowsAttachments", function() {
Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif"; Discourse.SiteSettings.authorized_extensions = ".jpg, .jpeg, .gif";
not(allowsAttachments(), "no attachments allowed by default"); not(allowsAttachments(), "no attachments allowed by default");
Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif|*"; Discourse.SiteSettings.authorized_extensions = ".jpg, .jpeg, .gif, *";
ok(allowsAttachments(), "attachments are allowed when all extensions are allowed"); ok(allowsAttachments(), "attachments are allowed when all extensions are allowed");
Discourse.SiteSettings.authorized_extensions = "jpg|jpeg|gif|pdf"; Discourse.SiteSettings.authorized_extensions = ".jpg, .jpeg, .gif, .pdf";
ok(allowsAttachments(), "attachments are allowed when at least one extension is not an image extension"); ok(allowsAttachments(), "attachments are allowed when at least one extension is not an image extension");
}); });