jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' into develop

This commit is contained in:
yuanke 2016-08-26 10:12:02 +08:00
parent 038975fdf7 82779c99ea
commit 4cf1bedbe1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/application.js
View File

@ -1453,7 +1453,7 @@ function description_showwords_ellipsis(id,num){
});
//去掉空格
str = str.replace(/\s/gi,'');
str = str.replace(/[\f\n\r\t\v]/gi,'');
if(str.length > num){
str = str.substring(0,num)+"...";

4
public/javascripts/wechat/others/factory.js
View File

@ -247,11 +247,11 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms','config','wx','$loc
var desc = ""
if(response.data.data.content){
desc = response.data.data.content.replace(/<[^>]+>/g,"").replace(/\s*/g,"").replace(/&nbsp;/g,"");
desc = response.data.data.content.replace(/<[^>]+>/gi,"").replace(/[\f\n\r\t\v]/gi,"").replace(/&nbsp;/gi,"");
}
if(response.data.data.description){
desc = response.data.data.description.replace(/<[^>]+>/g,"").replace(/\s*/g,"").replace(/&nbsp;/g,"");
desc = response.data.data.description.replace(/<[^>]+>/gi,"").replace(/[\f\n\r\t\v]/gi,"").replace(/&nbsp;/gi,"");
}
if(desc.length > 30){