replaced call socket() with apiOn/apiOff

This commit is contained in:
Jan Prochazka
2021-12-22 11:24:48 +01:00
parent 05ea435820
commit 2ace0bdb34
13 changed files with 41 additions and 46 deletions

View File

@@ -6,7 +6,7 @@
import JslDataGrid from '../datagrid/JslDataGrid.svelte';
import TabControl from '../elements/TabControl.svelte';
import { allResultsInOneTabDefault } from '../stores';
import socket from '../utility/socket';
import { apiOff, apiOn } from '../utility/api';
import useEffect from '../utility/useEffect';
import AllResultsTab from './AllResultsTab.svelte';
@@ -66,9 +66,9 @@
});
function onSession(sid) {
if (sid) {
socket().on(`session-recordset-${sid}`, handleResultSet);
apiOn(`session-recordset-${sid}`, handleResultSet);
return () => {
socket().off(`session-recordset-${sid}`, handleResultSet);
apiOff(`session-recordset-${sid}`, handleResultSet);
};
}
return () => {};

View File

@@ -1,11 +1,11 @@
<script>
import ErrorInfo from '../elements/ErrorInfo.svelte';
import TableControl from '../elements/TableControl.svelte';
import { apiOff, apiOn } from '../utility/api';
import formatFileSize from '../utility/formatFileSize';
import getElectron from '../utility/getElectron';
import resolveApi from '../utility/resolveApi';
import socket from '../utility/socket';
import useEffect from '../utility/useEffect';
export let runnerId;
@@ -21,9 +21,9 @@
function registerRunnerDone(rid) {
if (rid) {
socket().on(`runner-done-${rid}`, handleRunnerDone);
apiOn(`runner-done-${rid}`, handleRunnerDone);
return () => {
socket().off(`runner-done-${rid}`, handleRunnerDone);
apiOff(`runner-done-${rid}`, handleRunnerDone);
};
} else {
return () => {};

View File

@@ -1,10 +1,9 @@
<script lang="ts">
import _ from 'lodash';
import ErrorInfo from '../elements/ErrorInfo.svelte';
import { apiOff, apiOn } from '../utility/api';
import createRef from '../utility/createRef';
import socket from '../utility/socket';
import useEffect from '../utility/useEffect';
import MessageView from './MessageView.svelte';
@@ -30,9 +29,9 @@
$: effect = useEffect(() => {
if (eventName) {
socket().on(eventName, handleInfo);
apiOn(eventName, handleInfo);
return () => {
socket().off(eventName, handleInfo);
apiOff(eventName, handleInfo);
};
}
return () => {};