bug fixed
This commit is contained in:
parent
415de783c0
commit
c294cc66b5
2
package-lock.json
generated
2
package-lock.json
generated
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "ucap-webmessenger",
|
||||
"version": "0.0.5",
|
||||
"version": "0.0.9",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
@ -36,6 +36,7 @@ import {
|
|||
of,
|
||||
BehaviorSubject
|
||||
} from 'rxjs';
|
||||
|
||||
import {
|
||||
Info,
|
||||
EventType,
|
||||
|
@ -472,14 +473,14 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
return this.loginResSubject.value.userSeq !== roomUserInfo.seq;
|
||||
});
|
||||
} else {
|
||||
return this.userInfoListSubject.value
|
||||
.filter(roomUserInfo => {
|
||||
return (
|
||||
this.loginResSubject.value.userSeq !== roomUserInfo.seq &&
|
||||
roomUserInfo.isJoinRoom
|
||||
);
|
||||
})
|
||||
.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
|
||||
return this.userInfoListSubject.value
|
||||
.filter(roomUserInfo => {
|
||||
return (
|
||||
this.loginResSubject.value.userSeq !== roomUserInfo.seq &&
|
||||
roomUserInfo.isJoinRoom
|
||||
);
|
||||
})
|
||||
.sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -733,7 +734,7 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
roomSeq: this.roomInfoSubject.value.roomSeq,
|
||||
eventType: EventType.MassText,
|
||||
// sentMessage: message.replace(/\n/gi, '\r\n')
|
||||
sentMessage: message
|
||||
sentMessage: StringUtil.escapeHtml(message)
|
||||
}
|
||||
})
|
||||
);
|
||||
|
|
|
@ -236,4 +236,18 @@ export class StringUtil {
|
|||
}
|
||||
return eventMessage;
|
||||
}
|
||||
|
||||
static escapeHtml(dirty: string): string {
|
||||
return (dirty + '').replace(
|
||||
/[&<>"']/g,
|
||||
m =>
|
||||
({
|
||||
'&': '&',
|
||||
'<': '<',
|
||||
'>': '>',
|
||||
'"': '"',
|
||||
"'": '''
|
||||
}[m])
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user