hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

Browse Source
weixin_guange
yuanke 9 years ago
parent 28ce8a6dc8 b100651185
commit 94a4ee9525
4 changed files with 90 additions and 89 deletions
Show Stats Download Patch File Download Diff File

2
public/assets/wechat/app.html
Unescape View File

@ -36,7 +36,7 @@
<script src="/javascripts/wechat/directives/form_validate.js"></script>
<script src="/javascripts/wechat/directives/input_auto.js"></script>
<script src="/javascripts/wechat/directives/loading_spinner.js"></script>
<!--<script src="/javascripts/wechat/directives/ellipsis.js"></script>-->
<script src="/javascripts/wechat/directives/ellipsis.js"></script>
<script src="/javascripts/wechat/controllers/reg.js"></script>
<script src="/javascripts/wechat/controllers/login.js"></script>
<script src="/javascripts/wechat/controllers/activity.js"></script>

14
public/assets/wechat/new_project.html
Unescape View File

@ -8,16 +8,16 @@
<div class="f12 c-grey6 tac">
<span class="f13 fb c-grey3">项目功能特性（微信版）</span>
<ul class="project-intro mb15 mt5">
<li>创建项目、加入项目</li>
<li>邀请成员、修改角色</li>
<li>浏览、回复项目动态</li>
<li>点赞、分享项目动态</li>
<li><span class="project-intro-dot">•</span>创建项目、加入项目</li>
<li><span class="project-intro-dot">•</span>邀请成员、修改角色</li>
<li><span class="project-intro-dot">•</span>浏览、回复项目动态</li>
<li><span class="project-intro-dot">•</span>点赞、分享项目动态</li>
</ul>
<span class="f13 fb c-grey3">更多项目特性（浏览器版）</span>
<ul class="project-intro mt5">
<li>发布任务、问题跟踪</li>
<li>代码托管、质量分析</li>
<li>资源分享、交流研讨</li>
<li><span class="project-intro-dot">•</span>发布任务、问题跟踪</li>
<li><span class="project-intro-dot">•</span>代码托管、质量分析</li>
<li><span class="project-intro-dot">•</span>资源分享、交流研讨</li>
</ul>
</div>
</form>

44
public/javascripts/wechat/directives/ellipsis.js
Unescape View File

@ -1,25 +1,25 @@
/**
* Created by Tim on 7/22/16.
*/
//app.directive('ellipsisShow',["$timeout",function(timer){
// return{
// restrict: 'A',
// scope: {},
// link: function(scope, element){
// timer(function() {
// var textSplit = element.text().split(" ");
// var newContent = [];
// element.text("");
// for (var i = 0; i < textSplit.length; i++) {
// newContent = newContent + " " + textSplit[i];
// element.text(newContent);
// if(element[0].scrollHeight >= 100){
// newContent = newContent + " " + textSplit[i+1] + " " + textSplit[i+2] + " " + textSplit[i+3] + " " + textSplit[i+4] + "...";
// element.text(newContent);
// break;
// }
// }
// });
// }
// }
//}]);
app.directive('ellipsisShow',["$timeout",function(timer){
return{
restrict: 'A',
scope: {},
link: function(scope, element){
timer(function() {
var textSplit = element.text().split("");
var newContent = [];
element.text("");
for (var i = 0; i < textSplit.length; i++) {
newContent = newContent + textSplit[i];
element.text(newContent);
if(element[0].scrollHeight >= 100){
newContent = newContent + textSplit[i+1] + textSplit[i+2] + textSplit[i+3] + textSplit[i+4] + textSplit[i+5] + textSplit[i+6] + textSplit[i+7] + textSplit[i+8] + textSplit[i+9] + textSplit[i+10] + "...";
element.text(newContent);
break;
}
}
});
}
}
}]);

5
public/stylesheets/weui/weixin.css
Unescape View File

@ -241,5 +241,6 @@ a.underline {text-decoration:underline;}
/*20160729项目说明*/
.project-intro {line-height:2; width:140px; margin-left:auto; margin-right:auto;}
.project-intro li {list-style:disc; margin-left:20px;}
.project-intro {line-height:2; width:120px; margin-left:auto; margin-right:auto;}
.project-intro li {position:relative;}
.project-intro-dot {font-size:25px; font-weight:bold; position:absolute; left:-10px; top:-13px;}
Write Preview
Loading…
Cancel
Save