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

Merge pull request #619 from ZogStriP/fix-cannot-paste-text-in-composer 

FIX: cannot paste text in composer
This commit is contained in:
Sam 2013-04-01 17:19:49 -07:00
parent 028d3bd19f 0cb8ea1426
commit 3376ea5615
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/views/composer_view.js
View File

@ -285,11 +285,13 @@ Discourse.ComposerView = Discourse.View.extend({
// can only upload one image at a time
if (data.files.length > 1) {
bootbox.alert(Em.String.i18n('post.errors.upload_too_many_images'));
return false;
} else if (data.files.length > 0) {
// check image size
var fileSizeInKB = data.files[0].size / 1024;
if (fileSizeInKB > Discourse.SiteSettings.max_upload_size_kb) {
bootbox.alert(Em.String.i18n('post.errors.upload_too_large', { max_size_kb: Discourse.SiteSettings.max_upload_size_kb }));
return false;
} else {
// reset upload status
_this.setProperties({
@ -299,7 +301,8 @@ Discourse.ComposerView = Discourse.View.extend({
return true;
}
}
return false;
// we need to return true here, otherwise it prevents the default paste behavior
return true;
};
// paste