|
|
@@ -113,6 +113,7 @@
|
|
|
};
|
|
|
var replaceImage = function(content) {}
|
|
|
var html = '';
|
|
|
+ //var message = document.getElementById("loadmore");
|
|
|
if (scope.msg.senderDisplayName === undefined || scope.msg.senderDisplayName == '')
|
|
|
scope.msg.senderDisplayName = scope.msg.sender;
|
|
|
// 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息], [4，位置消息]，[5，语音消息]）
|
|
|
@@ -124,13 +125,13 @@
|
|
|
var style = scope.msg.style === "" || scope.msg.style === undefined ? {
|
|
|
style: 'normal',
|
|
|
weight: 'normal',
|
|
|
- size: 9,
|
|
|
+ size: 10,
|
|
|
family: '微软雅黑',
|
|
|
color: 16777215
|
|
|
} : _.assign({
|
|
|
style: 'normal',
|
|
|
weight: 'normal',
|
|
|
- size: 9,
|
|
|
+ size: 10,
|
|
|
family: '微软雅黑',
|
|
|
color: 16777215
|
|
|
}, JSON.parse(scope.msg.style));
|
|
|
@@ -139,13 +140,13 @@
|
|
|
var style = scope.msg.style === "" || scope.msg.style === undefined ? {
|
|
|
style: 'normal',
|
|
|
weight: 'normal',
|
|
|
- size: 9,
|
|
|
+ size: 10,
|
|
|
family: '微软雅黑',
|
|
|
color: 0
|
|
|
} : _.assign({
|
|
|
style: 'normal',
|
|
|
weight: 'normal',
|
|
|
- size: 9,
|
|
|
+ size: 10,
|
|
|
family: '微软雅黑',
|
|
|
color: 0
|
|
|
}, JSON.parse(scope.msg.style));
|
|
|
@@ -167,7 +168,7 @@
|
|
|
'<p><input type="text" readonly="readonly" value="' + getFileName(content) + '"></p>' +
|
|
|
'<span>大小：' + getFileSize(content) + '</span>' +
|
|
|
'<div class="p-t-sm text-right">' +
|
|
|
- '<span id="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>传输完成</span></span>' +
|
|
|
+ '<span class="transinfo"><span style="color:green;" class="glyphicon glyphicon-ok"></span><span>传输完成</span></span>' +
|
|
|
'<a class="text-primary" role="button"><span ng-click="OpenFile(msg.content)">打开</span></a>  ' +
|
|
|
'<a class="text-primary" role="button"><span ng-click="OpenDirectory(msg.content)">打开文件夹</span></a>' +
|
|
|
'</div>' +
|
|
|
@@ -184,25 +185,23 @@
|
|
|
}
|
|
|
|
|
|
if (getUserID()) {
|
|
|
- var html_g = '<div class="feed-element">' +
|
|
|
- '<div class="media-body">' +
|
|
|
+ var html_g =
|
|
|
'<p><strong>' +
|
|
|
scope.msg.senderDisplayName +
|
|
|
'</strong><small class="text-muted">-' +
|
|
|
getTime(scope.msg) + '</small></p>' +
|
|
|
'<div class="wellself m-l-xs m-t-xs fit-content" >' +
|
|
|
'<div class="text-point"></div>' + html +
|
|
|
- '</div></div></div>';
|
|
|
+ '</div>';
|
|
|
} else {
|
|
|
- var html_g = '<div class="feed-element">' +
|
|
|
- '<div class="media-body">' +
|
|
|
+ var html_g =
|
|
|
'<p><strong>' +
|
|
|
scope.msg.senderDisplayName +
|
|
|
'</strong><small class="text-muted">-' +
|
|
|
getTime(scope.msg) + '</small></p>' +
|
|
|
'<div class="well m-l-xs m-t-xs fit-content" >' +
|
|
|
'<div class="text-point"></div>' + html +
|
|
|
- '</div></div></div>';
|
|
|
+ '</div>';
|
|
|
}
|
|
|
console.log(html_g);
|
|
|
|
|
|
@@ -211,20 +210,18 @@
|
|
|
// 也可以用$scope.$new()创建继承的作用域
|
|
|
var $dom = compileFn(scope);
|
|
|
// 添加到文档中
|
|
|
-
|
|
|
//angular.element("#loadmore").prepend($dom);
|
|
|
var newElement = angular.element($dom);
|
|
|
element.prepend(newElement);
|
|
|
if (scope.count) {
|
|
|
gotoBottom();
|
|
|
- element.addEventListener('load', window.scrollTo(0, document.body.scrollHeight));
|
|
|
} else {
|
|
|
- element.addEventListener('load', window.scrollTo(0, document.body.scrollHeight - scope.height));
|
|
|
+ element[0].addEventListener('load', window.scrollTo(0, document.body.scrollHeight - scope.height));
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
/* @ngInject */
|
|
|
- function ControllerController($scope) {
|
|
|
+ function ControllerController($scope, $location, $anchorScroll) {
|
|
|
$scope.OpenFile = function(item) {
|
|
|
var file = JSON.parse(item);
|
|
|
return lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'OpenFile', JSON.stringify(file), $scope);
|
|
|
@@ -235,7 +232,10 @@
|
|
|
return lxtalkClient.Invoke('{15180DEF-D508-45F7-BAEB-6486CD8752C8}', 'OpenDirectory', JSON.stringify(file), $scope);
|
|
|
};
|
|
|
$scope.scrollController = function() {
|
|
|
- window.scrollTo(0, document.body.scrollHeight - $scope.height);
|
|
|
+ if ($scope.count) {
|
|
|
+ window.scrollTo(0, document.body.scrollHeight);
|
|
|
+ } else
|
|
|
+ window.scrollTo(0, document.body.scrollHeight - $scope.height);
|
|
|
};
|
|
|
}
|
|
|
})();
|
dgf