Browse Source

add nl2br and fix auto-open chat bug

pull/54/head
Amir Sanni 5 years ago
parent
commit
89a09bf8e5
  1. 2
      comm.html
  2. 9
      css/comm.css
  3. 16
      js/comm.js

2
comm.html

@ -96,7 +96,7 @@
<div class="panel-footer"> <div class="panel-footer">
<span id="typingInfo"></span> <span id="typingInfo"></span>
<div class="input-group"> <div class="input-group">
<textarea id='chatInput' class="form-control chat-area" placeholder="Type message here..."></textarea> <textarea id='chatInput' class="form-control chat-input" placeholder="Type message here..."></textarea>
<span class="input-group-btn"> <span class="input-group-btn">
<button class="btn btn-primary btn-sm" id="chatSendBtn">Send</button> <button class="btn btn-primary btn-sm" id="chatSendBtn">Send</button>
</span> </span>

9
css/comm.css

@ -90,6 +90,11 @@
.col-md-4, .col-md-10{ .col-md-4, .col-md-10{
padding:0; padding:0;
} }
.chat-input {
resize: none;
}
.chat-pane-panel{ .chat-pane-panel{
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -207,10 +212,6 @@
} }
/* _CHAT PANE */ /* _CHAT PANE */
.chat-area {
resize: none;
}
/* /*
******************************************************************************************************************************** ********************************************************************************************************************************
******************************************************************************************************************************** ********************************************************************************************************************************

16
js/comm.js

@ -430,7 +430,7 @@ window.addEventListener('load', function(){
*/ */
//Maximise the chat pane when user focuses on the input and pane is collapsed //Maximise the chat pane when user focuses on the input and pane is collapsed
$('.chat-pane').on('focus', '.chat_input', function () { $('.chat-pane').on('focus', '.chat-input', function () {
var $this = $(this); var $this = $(this);
if ($('#minim_chat_window').hasClass('panel-collapsed')) { if ($('#minim_chat_window').hasClass('panel-collapsed')) {
@ -813,7 +813,7 @@ function addRemoteChat(msg, date){
}).then(function(newlyCreatedNode){ }).then(function(newlyCreatedNode){
newlyCreatedNode.innerHTML = `<div class="col-sm-10 col-xs-10"> newlyCreatedNode.innerHTML = `<div class="col-sm-10 col-xs-10">
<div class="messages msg_receive"> <div class="messages msg_receive">
<p>${msg}</p> <p>${nl2br(msg)}</p>
<time>Remote ${date}</time> <time>Remote ${date}</time>
</div> </div>
</div>`; </div>`;
@ -858,8 +858,8 @@ function addLocalChat(msg, date, sendToPartner){
}).then(function(newlyCreatedNode){ }).then(function(newlyCreatedNode){
newlyCreatedNode.innerHTML = `<div class="col-sm-10 col-xs-10"> newlyCreatedNode.innerHTML = `<div class="col-sm-10 col-xs-10">
<div class="messages msg_sent"> <div class="messages msg_sent">
<p>${msg}</p> <p>${nl2br(msg)}</p>
<time>You ${date} <i class="fa fa-clock-o sentStatus" id="'+msgId+'"></i></time> <time>You ${date} <i class="fa fa-clock-o sentStatus" id="${msgId}"></i></time>
</div> </div>
</div>`; </div>`;
@ -1198,3 +1198,11 @@ function saveRecordedStream(chunk){
saveAs(file); saveAs(file);
} }
function nl2br( str, is_xhtml ) {
if ( typeof str === 'undefined' || str === null ) {
return '';
}
var breakTag = ( is_xhtml || typeof is_xhtml === 'undefined' ) ? '<br />' : '<br>';
return ( str + '' ).replace( /([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2' );
}

Loading…
Cancel
Save