Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger
This commit is contained in:
commit
121883a46c
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ucap-webmessenger",
|
"name": "ucap-webmessenger",
|
||||||
"version": "0.0.5",
|
"version": "0.0.9",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -36,6 +36,7 @@ import {
|
||||||
of,
|
of,
|
||||||
BehaviorSubject
|
BehaviorSubject
|
||||||
} from 'rxjs';
|
} from 'rxjs';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
Info,
|
Info,
|
||||||
EventType,
|
EventType,
|
||||||
|
@ -733,7 +734,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
roomSeq: this.roomInfoSubject.value.roomSeq,
|
roomSeq: this.roomInfoSubject.value.roomSeq,
|
||||||
eventType: EventType.MassText,
|
eventType: EventType.MassText,
|
||||||
// sentMessage: message.replace(/\n/gi, '\r\n')
|
// sentMessage: message.replace(/\n/gi, '\r\n')
|
||||||
sentMessage: message
|
sentMessage: StringUtil.escapeHtml(message)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
|
@ -236,4 +236,19 @@ export class StringUtil {
|
||||||
}
|
}
|
||||||
return eventMessage;
|
return eventMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static escapeHtml(dirty: string): string {
|
||||||
|
return (dirty + '').replace(
|
||||||
|
/[&<>"']/g,
|
||||||
|
m =>
|
||||||
|
({
|
||||||
|
'&': '&',
|
||||||
|
'<': '<',
|
||||||
|
'>': '>',
|
||||||
|
'"': '"',
|
||||||
|
// tslint:disable-next-line: quotemark
|
||||||
|
"'": '''
|
||||||
|
}[m])
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user