Merge remote-tracking branch 'upstream/pull/1857'

[rails.git] / app / views / message / mark.js.erb

diff --git a/app/views/message/mark.js.erb b/app/views/message/mark.js.erb
index 2e545b62e0af5602eab891f4ca1c3e0bd56ab3db..d67e74ace9730704942f861c99a59b614482885b 100644 (file)
--- a/app/views/message/mark.js.erb
+++ b/app/views/message/mark.js.erb
@@ -1,3 +1,7 @@
 $("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>");
 $("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>");
 $("#inboxanchor").replaceWith("<%=j render :partial => "layouts/inbox" %>");
 $("#inbox-count").replaceWith("<%=j render :partial => "message_count" %>");

-$("#inbox-<%= @message.id %>").replaceWith("<%=j render :partial => "message_summary", :object => @message %>");
+<% if @message.message_read? -%>
+$("#inbox-<%= @message.id %>").removeClass("inbox-row-unread").addClass("inbox-row");
+<% else -%>
+$("#inbox-<%= @message.id %>").removeClass("inbox-row").addClass("inbox-row-unread");
+<% end -%>