[tor-commits] [pups/production] [#12626] Fixes multi-line support in webchat

[colin@xxxxxxxxxxxxxx]

commit fad8d3fedd274018fb6b9bad41c411bed550d34f
Author: Sherief <sheriefalaa.w@xxxxxxxxx>
Date:   Mon Oct 6 01:46:31 2014 +0200

    [#12626] Fixes multi-line support in webchat
---
 static/css/styles.css  |    1 +
 static/js/prodromus.js |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/static/css/styles.css b/static/css/styles.css
index cebaba8..d4467eb 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -122,6 +122,7 @@ div#prodromus div#prodromus-log div.message span.msgText {
     font-weight: bold;
     background: #E0E1E1 url(../images/prodromus_bubble_content.png) left top no-repeat;
     padding: 0px 12px;
+    word-wrap: break-word;
 }
 
 div#prodromus div#prodromus-log div.message span.msgPerson {
diff --git a/static/js/prodromus.js b/static/js/prodromus.js
index 29b2331..4652ed1 100644
--- a/static/js/prodromus.js
+++ b/static/js/prodromus.js
@@ -175,10 +175,6 @@ Prodromus.actionhandler = {
     },
 
     sendmessage: function() {
-        $('#prodromus-message').val( 
-            $('#prodromus-message').val().replace(/\n/g,"").replace(/\r/g,"")
-        );
-        
         if( $('#prodromus-message').val() != '' ) {
             Prodromus.buildAndSendMessage( $('#prodromus-message').val(), 'chat' );
 	        $('#prodromus-message').val('');
@@ -546,4 +542,4 @@ function getStatus(status)
         if (connfail !== true)
             Prodromus.PresenceReporter.giveFeedback();
     }
-}
\ No newline at end of file
+}



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits