From 0cb8ea1426ef80f90618be50ff0cb3949632fb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Tue, 2 Apr 2013 02:05:20 +0200 Subject: [PATCH] FIX: cannot paste text in composer --- app/assets/javascripts/discourse/views/composer_view.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/views/composer_view.js b/app/assets/javascripts/discourse/views/composer_view.js index 0eb07b7d0a2..b0f5457beb2 100644 --- a/app/assets/javascripts/discourse/views/composer_view.js +++ b/app/assets/javascripts/discourse/views/composer_view.js @@ -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