From c2beda8e402192e88ab1869862e9c2c86016ed47 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 13 Aug 2014 00:20:27 -0700
Subject: [PATCH] Get single recipient message composition working again

---
 index.html                     |  5 +++--
 js/views/new_message_button.js | 28 +++++++++++++++-------------
 stylesheets/index.css          |  3 +++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 stylesheets/index.css

diff --git a/index.html b/index.html
index 184bab486..bb1262ade 100644
--- a/index.html
+++ b/index.html
@@ -86,11 +86,12 @@
         </script>
         <script type='text/x-tmpl-mustache' id='new-message-form'>
           <form class='send message'>
-            <input name='number' class='number'>
+            <input type='text' name='number' class='number'>
             <div class='send-message-area'>
                 <div class='message-composer'>
-                    <input class='send-message' rows='6' type='textarea'>
+                    <input name='message' class='send-message' rows='6' type='textarea'>
                     <div class='attachments'> Add Files </div>
+                    <input type='submit'>
                 </div>
                 <div class='extension-details'>
                     <ul>
diff --git a/js/views/new_message_button.js b/js/views/new_message_button.js
index ed163883a..43d63b26c 100644
--- a/js/views/new_message_button.js
+++ b/js/views/new_message_button.js
@@ -26,7 +26,7 @@ var Whisper = Whisper || {};
       new Whisper.GroupRecipientsInputView({el: this.$el.find('input.numbers')}).$el.appendTo(this.$el);
     },
     events: {
-      'submit #send': 'send'
+      'submit .send': 'send'
     },
 
     send: function(e) {
@@ -65,34 +65,36 @@ var Whisper = Whisper || {};
   });
 
   Whisper.NewConversationView = Backbone.View.extend({
+    className: 'conversation',
     initialize: function() {
       this.template = $('#new-message-form').html();
       Mustache.parse(this.template);
+      this.render();
       this.input = this.$el.find('input.number');
       new Whisper.MessageRecipientInputView({el: this.input});
     },
 
     events: {
-      'submit #send': 'send',
-      'close': 'undelegateEvents'
+      'submit .send': 'send',
+      'close': 'remove'
     },
 
     send: function(e) {
       e.preventDefault();
       var number = this.input.val();
-      if (textsecure.utils.verifyNumber(number)) {
-        var thread = Whisper.Threads.findOrCreateForRecipient(number);
-        var send_input = this.$el.find('#send input');
-        thread.sendMessage(send_input.val());
-        send_input.val('');
-        this.$el.find('form.message').remove();
-        this.$el.trigger('close');
-        new Whisper.ConversationView({model: thread});
-      }
+      try {
+        if (textsecure.utils.verifyNumber(number)) {
+          var thread = Whisper.Threads.findOrCreateForRecipient(number);
+          var message_input = this.$el.find('input.send-message');
+          thread.sendMessage(message_input.val());
+          this.remove();
+        }
+      } catch(ex) {}
     },
 
     render: function() {
       this.$el.html(Mustache.render(this.template));
+      this.$el.show().insertAfter($('#gutter'));
       return this;
     }
   });
@@ -106,7 +108,7 @@ var Whisper = Whisper || {};
     new_message: function(e) {
       e.preventDefault();
       $('.conversation').hide().trigger('close'); // detach any existing conversation views
-      this.view = new Whisper.NewConversationView().render().$el.insertAfter($('#gutter'));
+      this.view = new Whisper.NewConversationView().$el.insertAfter($('#gutter'));
       //todo: less new
     },
 
diff --git a/stylesheets/index.css b/stylesheets/index.css
new file mode 100644
index 000000000..383d9237c
--- /dev/null
+++ b/stylesheets/index.css
@@ -0,0 +1,3 @@
+.number.error {
+  background-color: #ffdddd;
+}