Conversation & chat ok

app/assets/javascripts/chat.js

@@ -183,7 +183,6 @@ var ready = function () {
                 }
             }
             else {
-                console.log("IDDDD = " + conversation_id);
                 $.post("/typing", { conversation_id: conversation_id }, function (data) {
                 });
             }

app/controllers/conversations_controller.rb

@@ -34,6 +34,7 @@ def reply
     @path = reply_conversation_path(conversation)
     @message = conversation.messages.last
     PrivatePub.publish_to "/notifications", :conversation_id => conversation.id, :receiver_id => (conversation.participants - [current_user]).first
+    @conversation_id = conversation.id
     respond_to do |format|
       format.html {redirect_to conversation_path(conversation), notice: 'Reply sent'}
       format.js

app/views/conversations/reply.js.erb

@@ -4,17 +4,18 @@
 <% publish_to @path do %>
 var id = "<%= @conversation.id %>";
 var chatbox = $("#chatbox_" + id + " .chatboxcontent");
-var sender_id = "<%= @message.sender.id %>";
-var reciever_id = "<%= current_user.id %>";
+var sender_id = "<%= current_user.id %>";
+var reciever_id = $('meta[name=user-id]').attr("content");
 
 chatbox.append("<%= j render 'messages/message', message: @message %>");
-$(".chatboxtextarea").val("");
 chatbox.scrollTop(chatbox[0].scrollHeight);
-$(".seen").hide();
+$('#chatbox_' + id).find('.seen').hide();
 if (sender_id != reciever_id) {
   chatBox.chatWith(id);
   chatbox.children().last().removeClass("self").addClass("other");
   chatbox.scrollTop(chatbox[0].scrollHeight);
   chatBox.notify();
+} else {
+  $("#chatbox_"+ id +" .chatboxtextarea").val("");
 }
 <% end %>

app/views/conversations/show.html.erb

@@ -7,34 +7,36 @@
       <p>Chatting with
         <%= render 'conversations/participants', conversation: @conversation %>
       </p>
+      <span class="typing" hidden><i>Écrit</i> <%= image_tag "typing.gif" %></span>
     </div>
   </div>
-  <div class="panel panel-default">
-    <div class="panel-heading"><%= @conversation.subject %></div>
 
-    <div class="chatboxcontent chatboxcontent_big">
-      <% @conversation.receipts_for(current_user).each do |receipt| %>
-          <p><%= render 'messages/message', message: receipt.message %></p>
-      <% end %>
-      <p>
-        <span class="seen" hidden><i>Vu</i></span>
-      </p>
-    </div>
+  <div class="chatboxcontent chatboxcontent_big">
+    <% @conversation.receipts_for(current_user).each do |receipt| %>
+        <p><%= render 'messages/message', message: receipt.message %></p>
+    <% end %>
   </div>
-  <script>
-    $('.chatbox').click(function () {
-      $.ajax({
-        url: "/seen",
-        data: {conversation_id: "<%=@conversation.id%>"},
-        method: 'post'
-      });
-    });
-  </script>
+
   <div class="chatboxinput">
-    <%= form_tag reply_conversation_path(@conversation), :remote => true, method: :post do %>
-        <%= text_area_tag 'body', nil, cols: 3, class: 'form-control chatboxtextarea', placeholder: 'Type something...', required: true %>
+    <span class="seen" hidden><i>Vu</i></span>
+
+    <%= form_tag reply_conversation_path(@conversation),:remote => true , method: :post do %>
+        <%= text_area_tag 'body', nil, cols: 3, class: 'form-control chatboxtextarea', placeholder: 'Type something...', required: true, "data-cid" => @conversation.id  %>
         <%= submit_tag "Send Message", class: 'btn btn-primary' %>
     <% end %>
   </div>
   <%= subscribe_to reply_conversation_path(@conversation) %>
 </div>
+<script>
+  $('#chatbox_<%= @conversation.id %> .chatboxinput').click(function () {
+    $.ajax({
+      url: "/seen",
+      data: {conversation_id: "<%= @conversation.id %>"},
+      method: 'post'
+    });
+  });
+</script>
+<script>
+  var chatbox = $("#chatbox_<%= @conversation.id %> .chatboxcontent");
+  chatbox.scrollTop(chatbox[0].scrollHeight);
+</script>

app/views/conversations/show_min.html.erb

@@ -21,22 +21,22 @@
       <p><%= render 'messages/message', message: m %></p>
   <% end %>
 </div>
+
+<div class="chatboxinput">
+  <span class="seen" hidden><i>Vu</i></span>
+
+  <%= form_tag reply_conversation_path(@conversation),:remote => true , method: :post do %>
+      <%= text_area_tag 'body', nil, cols: 3, class: 'form-control chatboxtextarea', placeholder: 'Type something...', required: true, "data-cid" => @conversation.id  %>
+      <%= submit_tag "Send Message", class: 'btn btn-primary' %>
+  <% end %>
+</div>
+<%= subscribe_to reply_conversation_path(@conversation) %>
 <script>
-  $('.chatboxinput').click(function () {
-    console.log("bouh" + <%=@conversation.id%>);
+  $('#chatbox_<%= @conversation.id %> .chatboxinput').click(function () {
     $.ajax({
       url: "/seen",
       data: {conversation_id: "<%= @conversation.id %>"},
       method: 'post'
     });
   });
-</script>
-<div class="chatboxinput">
-  <span class="seen" hidden><i>Vu</i></span>
-
-  <%= form_tag reply_conversation_path(@conversation),:remote => true, method: :post do %>
-      <%= text_area_tag 'body', nil, cols: 3, class: 'form-control chatboxtextarea', placeholder: 'Type something...', required: true %>
-      <%= submit_tag "Send Message", class: 'btn btn-primary' %>
-  <% end %>
-</div>
-<%= subscribe_to reply_conversation_path(@conversation) %>
+</script>

app/views/messages/new.html.erb

@@ -16,7 +16,7 @@
 
     <div class="form-group">
       <%= label_tag 'recipients', 'Choose recipients' %>
-      <%= select_tag 'recipients', recipients_options, multiple: true, class: 'form-control chosen-it' %>
+      <%= select_tag 'recipients', recipients_options, multiple: false, class: 'form-control chosen-it' %>
     </div>
 
     <%= submit_tag 'Send', class: 'btn btn-primary' %>

app/views/messages/seen.js.erb

@@ -3,10 +3,12 @@ var id = "<%= @conversation.id %>";
 var chatbox = $("#chatbox_" + id + " .chatboxcontent");
 var sender_id = "<%= current_user.id %>";
 var reciever_id = $('meta[name=user-id]').attr("content");
+var last_id = "<%= @conversation.messages.last.sender.id %>";
 console.log("seeeeeeeeen");
-if (sender_id != reciever_id){
-
+chatbox.scrollTop(chatbox[0].scrollHeight);
+if (sender_id != reciever_id && sender_id != last_id){
   $('#chatbox_' + id).find('.seen').show();
-  chatbox.scrollTop(chatbox[0].scrollHeight);
+}else {
+  $('#chatbox_' + id).find('.seen').hide();
 }
 <% end %>

app/views/messages/typing.js.erb

@@ -5,13 +5,12 @@ var chatbox = $("#chatbox_" + id + " .chatboxcontent");
 var sender_id = "<%= current_user.id %>";
 var reciever_id = $('meta[name=user-id]').attr("content");
 
-$('#chatbox_' + id).find('.seen').hide();
 if (sender_id != reciever_id) {
   $('#chatbox_' + id).find('.typing').show();
 
   setTimeout(function () {
     $('#chatbox_' + id).find('.typing').fadeOut();
   }, 3000);
-  chatbox.scrollTop(chatbox[0].scrollHeight);
+ // chatbox.scrollTop(chatbox[0].scrollHeight);
 }
 <% end %>

solr/pids/development/sunspot-solr-development.pid

@@ -1 +1 @@
-15071
+18185