From 6d7eca487f5ef521692267fbacceacc609981665 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 20 May 2016 17:02:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=86KE=E7=9A=84newlineTag=EF=BC=9A'br'?= =?UTF-8?q?=20=E6=94=B9=E4=B8=BA'p',=E6=96=B9=E4=BE=BF=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E7=BD=91=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 2 +- public/javascripts/application.js | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index c86a9ccd3..a8c17345b 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -249,7 +249,7 @@ K.options = { themeType : 'default', langType : 'zh_CN', urlType : '', - newlineTag : 'br', + newlineTag : 'p', resizeType : 1, syncType : 'form', pasteType : 2, diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 3828b981b..aec0af070 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1316,17 +1316,12 @@ function pop_up_box(value,tWidth,tTop,tLeft){ } } - //yk 自动识别URL 并加上链接 -//var strRegex = '((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?'; - function autoUrl(id){ if ($("#"+id).children().length > 0 ){ $("#"+id+" p,#"+ id +" span,#"+id+" em,#"+id+" h1,#"+id+" h2,#"+id+" h3,#"+id+" h4,#"+id+" strong,#"+id+" b,#"+id+" font,#"+id+" i").each(function(){ if ($(this).children().length == 0){ - var html = $(this).text(); //.replace(/(^\s*)|(\s*$)/g, "") - console.log("html="+html); -// var re=new RegExp(strRegex,"g"); + var html = $(this).text(); html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { //没有://的都加上http:// var reStr = full; @@ -1337,7 +1332,6 @@ function autoUrl(id){ else{ reStr = ""+full+""; } - console.log("reStr="+reStr); } return reStr ; }); @@ -1346,11 +1340,9 @@ function autoUrl(id){ }); } else{ - var html = $("#"+id).text(); //.replace(/(^\s*)|(\s*$)/g, "") - console.log("!!!!html="+html); -// var re=new RegExp(strRegex,"g"); + var html = $("#"+id).text(); html = html.replace(/((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*[\.。])+([a-z]{3}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&]*)?)?(#[a-z][a-z0-9_]*)?/g,function(full) { - //没有://的都加上http:// + //没有://的都加上http:// var reStr = full; if (full.length > 0){ if (full.indexOf("://") >= 0){ @@ -1359,7 +1351,6 @@ function autoUrl(id){ else{ reStr = ""+full+""; } - console.log("reStr="+reStr); } return reStr ; }); From 0e827abd359350c502da31509953d2112eedbf64 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 20 May 2016 17:25:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=86=E4=BB=A3=E7=A0=81=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=BC=96=E8=AF=91=E5=99=A8=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=86=92=E5=8F=B7=E6=94=B9=E4=B8=BA=E4=B8=AD=E6=96=87=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/new_user_commit_homework.html.erb | 8 ++++---- app/views/users/user_commit_homework.html.erb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb index c066baae0..4a7e5cee3 100644 --- a/app/views/users/new_user_commit_homework.html.erb +++ b/app/views/users/new_user_commit_homework.html.erb @@ -93,13 +93,13 @@
请使用 <%= @homework.language_name %> 语言编写 <% if @homework.language.to_i == 1 %> - 编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + 编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) <% elsif @homework.language.to_i == 2 %> - 编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + 编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) <% elsif @homework.language.to_i == 3 %> - 编译器信息:Python version "2.6.6" + 编译器信息：Python version "2.6.6" <% elsif @homework.language.to_i == 4 %> - 编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment + 编译器信息：java version "1.7.0_85" OpenJDK Runtime Environment <% end %> style="display-hidden" id="data-language">
diff --git a/app/views/users/user_commit_homework.html.erb b/app/views/users/user_commit_homework.html.erb index 043886779..1d1d0ef14 100644 --- a/app/views/users/user_commit_homework.html.erb +++ b/app/views/users/user_commit_homework.html.erb @@ -76,13 +76,13 @@
请使用 <%= @homework.language_name %> 语言编写 <% if @homework.language.to_i == 1 %> - 编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + 编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) <% elsif @homework.language.to_i == 2 %> - 编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) + 编译器信息：gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC) <% elsif @homework.language.to_i == 3 %> - 编译器信息:Python version "2.6.6" + 编译器信息：Python version "2.6.6" <% elsif @homework.language.to_i == 4 %> - 编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment + 编译器信息：java version "1.7.0_85" OpenJDK Runtime Environment <% end %>
From bc8171501db1524971a11dd6c9dc3fa26d481302 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 20 May 2016 18:40:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AE=BE=E4=B8=BA=E9=A6=96=E9=A1=B5=E6=8A=A5?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_show_home_page.html.erb | 2 +- app/views/users/_user_journalsformessage.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb index 7d8f7963f..ecb5ebb25 100644 --- a/app/views/organizations/_show_home_page.html.erb +++ b/app/views/organizations/_show_home_page.html.erb @@ -59,7 +59,7 @@ postContent=postContent.replace(/  /g,"   "); $(this).html(postContent); }); - autoUrl('intro_content_<%= @document.id %>'); + autoUrl('intro_content_<%= document.id %>'); function expand_reply(container, btnid) { var target = $(container); var btn = $(btnid); diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb index d39cccb11..47d5145ac 100644 --- a/app/views/users/_user_journalsformessage.html.erb +++ b/app/views/users/_user_journalsformessage.html.erb @@ -88,8 +88,8 @@ <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %> <% replies_all_i = replies_all_i + 1 %> @@ -121,7 +121,7 @@ <% end %>
-
+
<%= comment.notes.html_safe %>