kittyfangs/fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'canary' into feature/dictionary

Browse Source
This commit is contained in:
Mr. Stallion 2021-01-20 15:38:08 -06:00
commit a56b9baed6
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chat/Chat.vue
View File

@ -45,6 +45,7 @@
import Logs from './Logs.vue';
import {init as profileApiInit} from './profile_api';
import { AdManager } from './ads/ad-manager';
import { EventBus } from './preview/event-bus';
type BBCodeNode = Node & {bbcodeTag?: string, bbcodeParam?: string};
@ -139,9 +140,11 @@
AdManager.onConnectionClosed();
core.adCoordinator.clear();
EventBus.clear();
// tslint:disable-next-line:no-floating-promises
core.siteSession.onConnectionClosed();
core.cache.stop();
document.title = l('title');
});
@ -178,6 +181,7 @@
// tslint:disable-next-line:no-floating-promises
core.siteSession.onConnectionEstablished();
core.cache.start((core.state as any).generalSettings, true);
});
core.watch(() => core.conversations.hasNew, (hasNew) => {
document.title = (hasNew ? '💬 ' : '') + l(core.connection.isOpen ? 'title.connected' : 'title', core.connection.character);

5
chat/preview/event-bus.ts
View File

@ -77,6 +77,11 @@ class EventBusManager {
$emit(eventName: string, eventData: EventBusEvent): void {
_.each(this.eventCallbacks[eventName] || [], (cb) => (cb(eventData)));
}
clear(): void {
this.eventCallbacks = {};
}
}
export const EventBus = new EventBusManager();

2
chat/preview/image-dom-mutator.ts
View File

@ -64,7 +64,7 @@ export class ImageDomMutator {
mutator = this.hostMutators['default'];
}
if (mutator.eventName !== eventName)
if ((!mutator) || (mutator.eventName !== eventName))
return;
// console.log(`Mutator match: ${mutator.match}`, (mutator === this.hostMutators['default']), url);