|
|
@@ -1,9 +1,9 @@
|
|
|
|
|
|
-'use strict';
|
|
|
-
|
|
|
-var appMessage = angular.module('appMessage', ['luegg.directives']);
|
|
|
-
|
|
|
-
|
|
|
+'use strict';
|
|
|
+
|
|
|
+var appMessage = angular.module('appMessage', ['luegg.directives']);
|
|
|
+
|
|
|
+
|
|
|
|
|
|
'use strict';
|
|
|
|
|
|
@@ -92,7 +92,6 @@ angular.module('appMessage').controller('MessageController', ['$scope', function
|
|
|
.directive('ngMsg', Directive);
|
|
|
|
|
|
Directive.inject = [];
|
|
|
-
|
|
|
function Directive() {
|
|
|
var directive = {
|
|
|
link: link,
|
|
|
@@ -106,16 +105,29 @@ angular.module('appMessage').controller('MessageController', ['$scope', function
|
|
|
|
|
|
function link(scope, element, attrs) {
|
|
|
var replaceSystemFace = function(content){
|
|
|
- if (scope.appContent === undefined || scope.appContent.faceConfig ===undefined || scope.appContent.faceConfig.sys === undefined)
|
|
|
- return content;
|
|
|
scope.appContent.faceConfig.sys.forEach(function(element) {
|
|
|
- content = content.replace(element.shortcut,'<img src="' + scope.appContent.directory.base + element.image + '">');
|
|
|
+ content = content.replace(element.shortcut,'<img src="local://' + scope.appContent.directory.base + element.image + '">');
|
|
|
}, this);
|
|
|
- return content;
|
|
|
- }
|
|
|
+ // var reg = /[(\w+)-src="(http://[\w\W]+?)"]/;
|
|
|
+ // var reg = new RegExp('\\[(\\w+)\\-src=\\"(http://[\\w\\W]+?)\\"\\]', "i");
|
|
|
+ var reg = new RegExp('\\[image\\-src=\\"([\\w\\W]+?)\\"\\]', "i");
|
|
|
+
|
|
|
+ var g = reg.exec(content);
|
|
|
+ console.log(JSON.stringify(g));
|
|
|
+ for(var i = 0; i <= g.length - 1; i++){
|
|
|
+ console.log(g[i]);
|
|
|
+ }
|
|
|
+ return content;
|
|
|
+ };
|
|
|
+ var replaceImage = function(content){
|
|
|
+
|
|
|
+ }
|
|
|
var html = '';
|
|
|
// 消息类型（[1，文本消息]，[2，图片消息]，[3，文件消息]，[4，语音消息], [5，位置消息]）
|
|
|
- if (scope.msg.contentType == 1) {
|
|
|
+ if (scope.appContent === undefined || scope.appContent.faceConfig ===undefined || scope.appContent.faceConfig.sys === undefined){
|
|
|
+ html = '<span class="text-message">' + scope.msg.content + '</span>';
|
|
|
+ } else if (scope.msg.contentType == 1) {
|
|
|
+
|
|
|
html = '<span class="text-message">' + replaceSystemFace(scope.msg.content) + '</span>';
|
|
|
} else if (scope.msg.contentType == 2) {
|
|
|
html = '<span class="text-message">' +
|
|
|
@@ -147,7 +159,7 @@ angular.module('appMessage').controller('MessageController', ['$scope', function
|
|
|
'</audio>' +
|
|
|
'</span>';
|
|
|
}
|
|
|
- console.log(html);
|
|
|
+
|
|
|
var newElement = angular.element(html);
|
|
|
element.append(newElement);
|
|
|
}
|
lqq