From 806c49a690b5db15030bb5e8d14c5f9983e875d4 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Thu, 11 Sep 2014 15:46:24 +0200
Subject: [PATCH] Added support of copy/paste of multi lines content

---
 webclient/app.css        | 5 +++++
 webclient/room/room.html | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/webclient/app.css b/webclient/app.css
index 2564ce3286..71af550679 100755
--- a/webclient/app.css
+++ b/webclient/app.css
@@ -257,6 +257,7 @@ a:active  { color: #000; }
 
 #mainInput {
     width: 100%;
+    resize: none;
 }
 
 .blink {
@@ -514,6 +515,10 @@ a:active  { color: #000; }
     text-align: left ! important;
 }
 
+.bubble .message {
+    /* Break lines when encountering CR+LF */
+    white-space: pre;
+}
 .bubble .messagePending {
     opacity: 0.3
 }
diff --git a/webclient/room/room.html b/webclient/room/room.html
index b00d632292..530545da53 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -97,6 +97,7 @@
                               ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/>
                         
                         <span ng-show='msg.content.msgtype === "m.text"' 
+                              class="message"
                               ng-class="msg.echo_msg_state"
                               ng-bind-html="((msg.content.msgtype === 'm.text') ? msg.content.body : '') | linky:'_blank'"/>
 
@@ -138,7 +139,7 @@
                         {{ state.user_id }} 
                     </td>
                     <td width="*">
-                        <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true" autocomplete="off" tab-complete/>
+                        <textarea id="mainInput" rows="1" ng-model="textInput" ng-enter="send()" ng-focus="true" autocomplete="off" tab-complete/>
                     </td>
                     <td id="buttonsCell">
                         <button ng-click="send()">Send</button>