Does not submit post on enter if there are pending attachments. Fixes #…

…472
pepyatka · Jun 10, 2015 · c75b979 · c75b979
1 parent 5447690
commit c75b979
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/public/js/app/fields/CreatePostView.js b/public/js/app/fields/CreatePostView.js
@@ -1,10 +1,14 @@
-define(["app/app"], function(App) {
+define(["app/app", "ember"], function(App, Ember) {
   "use strict";
 
   App.CreatePostView = Ember.TextArea.extend(Ember.TargetActionSupport, {
     classNames: ['edit-post-area'],
     valueBinding: 'parentView.controller.body',
-    action: 'create',
+    action: function() {
+      if (!(this.get('parentView.controller.isUploadingAttachment')
+           || Ember.isBlank(this.get('value'))))
+        return 'create'
+    }.property('parentView.controller.isUploadingAttachment'),
     viewName: 'createPost',
 
     keyPress: function (e) {