Merge branch 'yuanke' into develop

hjq_resource v20160520_01
huang 9 years ago
commit e10bc46361

@ -59,7 +59,7 @@
postContent=postContent.replace(/  /g,"   "); postContent=postContent.replace(/  /g,"   ");
$(this).html(postContent); $(this).html(postContent);
}); });
autoUrl('intro_content_<%= @document.id %>'); autoUrl('intro_content_<%= document.id %>');
function expand_reply(container, btnid) { function expand_reply(container, btnid) {
var target = $(container); var target = $(container);
var btn = $(btnid); var btn = $(btnid);

@ -88,8 +88,8 @@
<% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %> <% fetch_user_leaveWord_reply(activity).reorder("created_on desc").each do |comment| %>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
showNormalImage('reply_content_<%= user_activity_id %>'); showNormalImage('reply_content_<%= comment.id %>');
autoUrl('reply_content_<%= user_activity_id %>'); autoUrl('reply_content_<%= comment.id %>');
}); });
</script> </script>
<% replies_all_i = replies_all_i + 1 %> <% replies_all_i = replies_all_i + 1 %>
@ -121,7 +121,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= user_activity_id %>"> <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
<%= comment.notes.html_safe %> <%= comment.notes.html_safe %>
</div> </div>
</div> </div>

@ -93,13 +93,13 @@
<div class="mt15"> <div class="mt15">
<span>请使用 <%= @homework.language_name %> 语言编写</span> <span>请使用 <%= @homework.language_name %> 语言编写</span>
<% if @homework.language.to_i == 1 %> <% if @homework.language.to_i == 1 %>
<span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span> <span class = "fr">编译器信息gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
<% elsif @homework.language.to_i == 2 %> <% elsif @homework.language.to_i == 2 %>
<span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span> <span class = "fr">编译器信息gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
<% elsif @homework.language.to_i == 3 %> <% elsif @homework.language.to_i == 3 %>
<span class = "fr">编译器信息:Python version "2.6.6"</span> <span class = "fr">编译器信息Python version "2.6.6"</span>
<% elsif @homework.language.to_i == 4 %> <% elsif @homework.language.to_i == 4 %>
<span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span> <span class = "fr">编译器信息java version "1.7.0_85" OpenJDK Runtime Environment</span>
<% end %> <% end %>
<span data-language=<%=@homework.language%> style="display-hidden" id="data-language"></span> <span data-language=<%=@homework.language%> style="display-hidden" id="data-language"></span>
</div> </div>

@ -76,13 +76,13 @@
<div class="mt15"> <div class="mt15">
<span>请使用 <%= @homework.language_name %> 语言编写</span> <span>请使用 <%= @homework.language_name %> 语言编写</span>
<% if @homework.language.to_i == 1 %> <% if @homework.language.to_i == 1 %>
<span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span> <span class = "fr">编译器信息gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
<% elsif @homework.language.to_i == 2 %> <% elsif @homework.language.to_i == 2 %>
<span class = "fr">编译器信息:gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span> <span class = "fr">编译器信息gcc version "4.4.7" 20120313 (Red Hat 4.4.7-11) (GCC)</span>
<% elsif @homework.language.to_i == 3 %> <% elsif @homework.language.to_i == 3 %>
<span class = "fr">编译器信息:Python version "2.6.6"</span> <span class = "fr">编译器信息Python version "2.6.6"</span>
<% elsif @homework.language.to_i == 4 %> <% elsif @homework.language.to_i == 4 %>
<span class = "fr">编译器信息:java version "1.7.0_85" OpenJDK Runtime Environment</span> <span class = "fr">编译器信息java version "1.7.0_85" OpenJDK Runtime Environment</span>
<% end %> <% end %>
</div> </div>
<div class="mt10"> <div class="mt10">

@ -249,7 +249,7 @@ K.options = {
themeType : 'default', themeType : 'default',
langType : 'zh_CN', langType : 'zh_CN',
urlType : '', urlType : '',
newlineTag : 'br', newlineTag : 'p',
resizeType : 1, resizeType : 1,
syncType : 'form', syncType : 'form',
pasteType : 2, pasteType : 2,

@ -1316,17 +1316,12 @@ function pop_up_box(value,tWidth,tTop,tLeft){
} }
} }
//yk 自动识别URL 并加上链接 //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){ function autoUrl(id){
if ($("#"+id).children().length > 0 ){ 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(){ $("#"+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){ if ($(this).children().length == 0){
var html = $(this).text(); //.replace(/(^\s*)|(\s*$)/g, "") var html = $(this).text();
console.log("html="+html);
// var re=new RegExp(strRegex,"g");
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) { 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; var reStr = full;
@ -1337,7 +1332,6 @@ function autoUrl(id){
else{ else{
reStr = "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>"; reStr = "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
} }
console.log("reStr="+reStr);
} }
return reStr ; return reStr ;
}); });
@ -1346,11 +1340,9 @@ function autoUrl(id){
}); });
} }
else{ else{
var html = $("#"+id).text(); //.replace(/(^\s*)|(\s*$)/g, "") var html = $("#"+id).text();
console.log("!!!!html="+html);
// var re=new RegExp(strRegex,"g");
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) { 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; var reStr = full;
if (full.length > 0){ if (full.length > 0){
if (full.indexOf("://") >= 0){ if (full.indexOf("://") >= 0){
@ -1359,7 +1351,6 @@ function autoUrl(id){
else{ else{
reStr = "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>"; reStr = "<a target='_Blank' href="+"'http://"+full+"'"+">"+full+"</a>";
} }
console.log("reStr="+reStr);
} }
return reStr ; return reStr ;
}); });

Loading…
Cancel
Save