Client: Pasting multiple lines

diff --git a/client/assets/css/style.css b/client/assets/css/style.css
index 500cec46e28744a0b7e23f0eb41bc9e319ae4c87..4190677ec57d2b464c042e0d5a634f590884b2c6 100644 (file)
--- a/client/assets/css/style.css
+++ b/client/assets/css/style.css
@@ -10,15 +10,18 @@ a img { border:none; }
 #kiwi {
     overflow:hidden; position:relative; 
     height:100%;
-    font-family:Arial, Helvetica, sans-serif;
-    font-size:14px; line-height:1.4em;
     background: url(../img/background-light.png) left top repeat-x #E3E3E3;
     color: #555555;
 }
 
+#kiwi, #kiwi input, #kiwi textarea {
+    font-family:Arial, Helvetica, sans-serif;
+    font-size:14px; line-height:1.4em;
+}
+
 
 
-#kiwi input {
+#kiwi input, textarea {
     box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5),0 1px 0px rgba(255, 255, 255, 0.3);
     border: none;
     border-radius: 3px;
@@ -165,11 +168,12 @@ a img { border:none; }
     right:7px; left: 12.2em;
     height:1.7em;
 }
-#controlbox .input input {
+#controlbox .input .inp {
     border: medium none;
     box-shadow: none;
     border-radius: 0;
-    outline:none;
+    outline:none; resize:none;
+    overflow:hidden;
     position:relative;
     height:100%; width:100%;
 }

diff --git a/client/assets/dev/view.js b/client/assets/dev/view.js
index d140cb3feca8cfb71605996b627a263fa8b5bcf1..0b3eed20362b2c8fb1868508a8ce8d604fdcd7a8 100644 (file)
--- a/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@ -623,7 +623,7 @@ kiwi.view.TopicBar = Backbone.View.extend({
 \r
 kiwi.view.ControlBox = Backbone.View.extend({\r
     events: {\r
-        'keydown input.inp': 'process',\r
+        'keydown .inp': 'process',\r
         'click .nick': 'showNickChange'\r
     },\r
 \r
@@ -672,13 +672,16 @@ kiwi.view.ControlBox = Backbone.View.extend({
             inp_val = inp_val.trim();\r
 \r
             if (inp_val) {\r
-                this.processInput(inp_val);\r
+                $.each(inp_val.split('\n'), function (idx, line) {\r
+                    that.processInput(line);\r
+                });\r
 \r
                 this.buffer.push(inp_val);\r
                 this.buffer_pos = this.buffer.length;\r
             }\r
 \r
             inp.val('');\r
+            return false;\r
 \r
             break;\r
 \r

diff --git a/client/index.html b/client/index.html
index ab95be9fda678281d6bcf5ace56ef14c6718fd4b..b5f8cfeb256205a5259d07fdcfdfd462fdeb83e2 100644 (file)
--- a/client/index.html
+++ b/client/index.html
@@ -45,7 +45,7 @@
         <div id="controlbox">
             <div class="input">
                 <span class="nick"> </span>
-                <div class="input_wrap"><input type="text" class="inp" /></div>
+                <div class="input_wrap"><textarea class="inp"></textarea></div>
             </div>
         </div>
     </div>