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-07-29 16:13:38 +08:00
parent 18862fdee9 4abce11004
commit 78e44617e3
3 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
<script src="/javascripts/wechat/directives/form_validate.js"></script> <script src="/javascripts/wechat/directives/form_validate.js"></script>
<script src="/javascripts/wechat/directives/input_auto.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/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/reg.js"></script>
<script src="/javascripts/wechat/controllers/login.js"></script> <script src="/javascripts/wechat/controllers/login.js"></script>
<script src="/javascripts/wechat/controllers/activity.js"></script> <script src="/javascripts/wechat/controllers/activity.js"></script>

4
public/assets/wechat/new_project.html
View File

@ -5,7 +5,7 @@
<form novalidate name="classForm"> <form novalidate name="classForm">
<div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div> <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目名称</span><input class="new-class-input ml25" ng-model="project.name" required placeholder="如：团队协作方法与机制研究" /></div>
<a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a> <a ng-click="newProject(classForm, project)" ng-class="['finish-btn', {'btn-disabled':!classForm.$valid} ]" >完成</a>
<div class="f12 c-grey6" style="width:143px; margin:0 auto;"> <div class="f12 c-grey6 tac">
<span class="f13 fb c-grey3">项目功能特性（微信版）</span> <span class="f13 fb c-grey3">项目功能特性（微信版）</span>
<ul class="project-intro mb15 mt5"> <ul class="project-intro mb15 mt5">
<li>创建项目、加入项目</li> <li>创建项目、加入项目</li>
@ -13,8 +13,6 @@
<li>浏览、回复项目动态</li> <li>浏览、回复项目动态</li>
<li>点赞、分享项目动态</li> <li>点赞、分享项目动态</li>
</ul> </ul>
</div>
<div class="f12 c-grey6" style="width:156px; margin:0 auto;">
<span class="f13 fb c-grey3">更多项目特性（浏览器版）</span> <span class="f13 fb c-grey3">更多项目特性（浏览器版）</span>
<ul class="project-intro mt5"> <ul class="project-intro mt5">
<li>发布任务、问题跟踪</li> <li>发布任务、问题跟踪</li>

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

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