From 27a2aad3d62369294dcdc85d44d4fe57638cfc3c Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 14 Mar 2016 18:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E8=B4=B4=E5=90=A7=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E6=B7=BB=E5=8A=A0=E8=A7=86=E9=A2=91=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/show.html.erb     | 15 ++++++++++++++-
 public/javascripts/application.js |  3 ++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 634903558..83b90dc93 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -95,8 +95,21 @@
       </div>
       <div class="homepagePostReplyDes">
         <div class="homepagePostReplyPublisher mt-4"><a href="<%=user_path(reply.author)%>" class="newsBlue mr10 f14"><%= reply.author.name%></a><%=  format_date(reply.created_at) %></div>
-        <div class="homepagePostReplyContent"><%= reply.content.html_safe%></div>
+        <div class="homepagePostReplyContent" id="activity_description_<%= reply.id %>"><%= reply.content.html_safe%></div>
       </div>
+      <script type="text/javascript">
+          $(function(){
+              $("#activity_description_<%= reply.id %> p,#activity_description__<%= reply.id %> span,#activity_description_<%= reply.id %> em").each(function(){
+                  var postContent = $(this).html();
+                  postContent = postContent.replace(/&nbsp;/g," ");
+                  postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+                  postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+                  postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+                  $(this).html(postContent);
+              });
+              description_show_hide(<%= reply.id %>);
+          });
+      </script>
       <div class="cl"></div>
     </div>
      <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a8504ee1e..55d3eefad 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1170,7 +1170,8 @@ function getRootPath(){
     //获取主机地址，如： http://localhost:8083
     var localhostPaht=curWwwPath.substring(0,pos);
     //获取带"/"的项目名，如：/uimcardprj
-    var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
+//    var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
+    var projectName="";
     return(localhostPaht+projectName);
 }