Merge pull request #1142 from ZogStriP/fix-can-no-longer-paste-image-in-chrome-post-editor

FIX: can no longer paste image in Chrome post editor
This commit is contained in:
Sam
2013-07-03 16:08:51 -07:00
5 changed files with 25 additions and 5 deletions

View File

@@ -41,12 +41,28 @@ test("prevents files that are too big from being uploaded", function() {
ok(bootbox.alert.calledWith(Em.String.i18n('post.errors.upload_too_large', { max_size_kb: 5 })));
});
var dummyBlob = function() {
window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder || window.MSBlobBuilder;
if (window.BlobBuilder) {
var bb = new window.BlobBuilder();
bb.append([1]);
return bb.getBlob("image/png");
} else {
return new Blob([1], { "type" : "image\/png" });
}
};
test("allows valid uploads to go through", function() {
var image = { name: "image.png", size: 10 * 1024 };
Discourse.SiteSettings.max_upload_size_kb = 15;
this.stub(bootbox, "alert");
// image
var image = { name: "image.png", size: 10 * 1024 };
ok(validUpload([image]));
// pasted image
var pastedImage = dummyBlob();
ok(validUpload([pastedImage]));
ok(!bootbox.alert.calledOnce);
});

View File

@@ -125,7 +125,9 @@ var jsHintOpts = {
"controllerFor",
"containsInstance",
"deepEqual",
"resolvingPromiseWith"],
"resolvingPromiseWith",
"Blob",
"File"],
"node" : false,
"browser" : true,
"boss" : true,
@@ -183,4 +185,4 @@ var jsHintOpts = {
/external_development\//,
/external_production\//,
/defer\//,
/locales\//]) %>
/locales\//]) %>