Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
commit
94a4ee9525
@ -1,56 +1,56 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html ng-app="wechat">
|
<html ng-app="wechat">
|
||||||
<head>
|
<head>
|
||||||
<base href="/">
|
<base href="/">
|
||||||
<title>仅供本地调试使用</title>
|
<title>仅供本地调试使用</title>
|
||||||
<meta charset='utf-8' />
|
<meta charset='utf-8' />
|
||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<meta name="description" content="" />
|
<meta name="description" content="" />
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta content='True' name='HandheldFriendly' />
|
<meta content='True' name='HandheldFriendly' />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
|
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
|
||||||
|
|
||||||
<link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
|
<link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
|
||||||
<link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
|
<link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div ng-view>
|
<div ng-view>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
|
window.g_openid = 'oCnvgvz8R7QheXE-R9Kkr39j8Ndg';
|
||||||
window.g_debug = true; //调试标志,如果在本地请置为true
|
window.g_debug = true; //调试标志,如果在本地请置为true
|
||||||
window.apiUrl = 'http://localhost:3000/api/v1/';
|
window.apiUrl = 'http://localhost:3000/api/v1/';
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script src="/javascripts/wechat/build/angular.all.min.js"></script>
|
<script src="/javascripts/wechat/build/angular.all.min.js"></script>
|
||||||
<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
|
<!--<script src="/javascripts/wechat/build/app.min.js"></script>-->
|
||||||
|
|
||||||
|
|
||||||
<script src="/javascripts/wechat/app.js"></script>
|
<script src="/javascripts/wechat/app.js"></script>
|
||||||
<script src="/javascripts/wechat/others/factory.js"></script>
|
<script src="/javascripts/wechat/others/factory.js"></script>
|
||||||
<script src="/javascripts/wechat/others/filter.js"></script>
|
<script src="/javascripts/wechat/others/filter.js"></script>
|
||||||
<script src="/javascripts/wechat/directives/alert.js"></script>
|
<script src="/javascripts/wechat/directives/alert.js"></script>
|
||||||
<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>
|
||||||
<script src="/javascripts/wechat/controllers/add_class.js"></script>
|
<script src="/javascripts/wechat/controllers/add_class.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/blog.js"></script>
|
<script src="/javascripts/wechat/controllers/blog.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/course_notice.js"></script>
|
<script src="/javascripts/wechat/controllers/course_notice.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/discussion.js"></script>
|
<script src="/javascripts/wechat/controllers/discussion.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/homework.js"></script>
|
<script src="/javascripts/wechat/controllers/homework.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/issue.js"></script>
|
<script src="/javascripts/wechat/controllers/issue.js"></script>
|
||||||
<script src="/javascripts/wechat/controllers/journals.js"></script>
|
<script src="/javascripts/wechat/controllers/journals.js"></script>
|
||||||
<script src="/javascripts/wechat/others/routes.js"></script>
|
<script src="/javascripts/wechat/others/routes.js"></script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
@ -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] + textSplit[i+5] + textSplit[i+6] + textSplit[i+7] + textSplit[i+8] + textSplit[i+9] + textSplit[i+10] + "...";
|
||||||
// element.text(newContent);
|
element.text(newContent);
|
||||||
// break;
|
break;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
//}]);
|
}]);
|
Loading…
Reference in new issue