nostr/iris-messenger
1
0
Fork 0
mirror of https://github.com/irislib/iris-messenger.git synced 2024-09-19 17:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

close mobile search on navigate and esc, fix visibilitystatechange

Browse Source
This commit is contained in:
Martti Malmi 2021-08-13 11:22:45 +03:00
parent 60fe8c2306
commit d9d228c2ed
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/Session.js
View File

@ -110,7 +110,7 @@ function setOurOnlineStatus() {
if (chat && !ourActivity) {
chat.setMyMsgsLastSeenTime();
}
iris.Channel.setActivity(State.public, ourActivity = 'active'); // TODO: also on keypress
iris.Channel.setActivity(State.public, ourActivity = 'active');
clearTimeout(onlineTimeout);
onlineTimeout = setTimeout(() => iris.Channel.setActivity(State.public, ourActivity = 'online'), 30000);
}, 1000);
@ -120,7 +120,7 @@ function setOurOnlineStatus() {
document.addEventListener("visibilitychange", () => {
if (document.visibilityState === 'visible') {
iris.Channel.setActivity(State.public, ourActivity = 'active');
const chatId = activeRoute.replace('/profile/','').replace('/chat/','');
const chatId = location.pathname.slice(1).replace('chat/','');
const chat = activeRoute && channels[chatId];
if (chat) {
chat.setMyMsgsLastSeenTime();

25
src/js/components/Header.js
View File

@ -20,6 +20,13 @@ class Header extends Component {
super();
this.state = {latest: {}};
this.chatId = null;
this.escFunction = this.escFunction.bind(this);
}
escFunction(event){
if(event.keyCode === 27) {
this.state.showMobileSearch && this.setState({showMobileSearch: false});
}
}
getOnlineStatusText() {
@ -45,13 +52,18 @@ class Header extends Component {
route('/chat');
}
componentWillUnmount() {
super.componentWillUnmount();
document.removeEventListener("keydown", this.escFunction, false);
}
componentDidMount() {
document.addEventListener("keydown", this.escFunction, false);
State.local.get('showParticipants').on(this.inject());
State.local.get('unseenTotal').on(this.inject());
State.local.get('activeRoute').on(this.sub(
activeRoute => {
this.setState({about:null, title: ''});
this.setState({activeRoute});
this.setState({about:null, title: '', activeRoute, showMobileSearch: false});
const replaced = activeRoute.replace('/chat/new', '').replace('/chat/', '');
this.chatId = replaced.length < activeRoute.length ? replaced : null;
if (this.chatId) {
@ -121,9 +133,12 @@ class Header extends Component {
`}
</div>
${chatting ? '' : html`
<div class=${this.state.showMobileSearch ? '' : 'hidden-xs'}>
<span class="visible-xs-inline-block" onClick=${() => this.setState({showMobileSearch:false})}>${Icons.close}</span>
</div>
<a class=${this.state.showMobileSearch ? '' : 'hidden-xs'} href="" onClick=${e => {
e.preventDefault();
this.setState({showMobileSearch: false})
}}>
<span class="visible-xs-inline-block">${Icons.close}</span>
</a>
`}
<div class="text" style=${this.chatId ? 'cursor:pointer;text-align:center' : ''} onClick=${() => this.onTitleClicked()}>
${this.state.title && chatting ? html`