Skip to content
Snippets Groups Projects
Commit f842a359 authored by Felix Riehm's avatar Felix Riehm
Browse files

stop transition start event from triggering at initialisation

parent 00d06b42
No related branches found
No related tags found
No related merge requests found
...@@ -30,9 +30,9 @@ export class Canvas { ...@@ -30,9 +30,9 @@ export class Canvas {
public readonly settings: SettingsData; public readonly settings: SettingsData;
public readonly showNetworkInfoboxObservable: Subject<NetworkInfoboxData> public readonly showNetworkInfoboxObservable: Subject<NetworkInfoboxData>
public readonly updateDatabaseInfoSubject: Subject<DatabaseInfo> public readonly updateDatabaseInfoSubject: Subject<DatabaseInfo>
public readonly onCarouselTransitionStart: BehaviorSubject<[HatnoteVisService, Visualisation]> public readonly onCarouselTransitionStart: Subject<[HatnoteVisService, Visualisation]>
public readonly onThemeHasChanged: BehaviorSubject<[HatnoteVisService, Visualisation]> public readonly onThemeHasChanged: Subject<[HatnoteVisService, Visualisation]>
public readonly onCarouselTransitionEnd: BehaviorSubject<[HatnoteVisService, Visualisation]> public readonly onCarouselTransitionEnd: Subject<[HatnoteVisService, Visualisation]>
public readonly updateVersionSubject: Subject<[string, number]> public readonly updateVersionSubject: Subject<[string, number]>
public readonly newCircleSubject: Subject<CircleData> public readonly newCircleSubject: Subject<CircleData>
public readonly newBannerSubject: Subject<BannerData> public readonly newBannerSubject: Subject<BannerData>
...@@ -62,9 +62,9 @@ export class Canvas { ...@@ -62,9 +62,9 @@ export class Canvas {
constructor(theme: VisualisationDirector, settings: SettingsData, newCircleSubject: Subject<CircleData>, constructor(theme: VisualisationDirector, settings: SettingsData, newCircleSubject: Subject<CircleData>,
showNetworkInfoboxObservable: Subject<NetworkInfoboxData>, showNetworkInfoboxObservable: Subject<NetworkInfoboxData>,
updateVersionSubject: Subject<[string, number]>, updateVersionSubject: Subject<[string, number]>,
onCarouselTransitionStart: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionStart: Subject<[HatnoteVisService, Visualisation]>,
onCarouselTransitionMid: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionMid: Subject<[HatnoteVisService, Visualisation]>,
onCarouselTransitionEnd: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionEnd: Subject<[HatnoteVisService, Visualisation]>,
updateDatabaseInfoSubject: Subject<DatabaseInfo>, updateDatabaseInfoSubject: Subject<DatabaseInfo>,
newBannerSubject: Subject<BannerData>, newBannerSubject: Subject<BannerData>,
appContainer: Selection<HTMLDivElement, unknown, null, undefined>) { appContainer: Selection<HTMLDivElement, unknown, null, undefined>) {
......
...@@ -32,9 +32,9 @@ function main(){ ...@@ -32,9 +32,9 @@ function main(){
// create observables // create observables
let newCircleSubject: Subject<CircleData> = new Subject() let newCircleSubject: Subject<CircleData> = new Subject()
let newBannerSubject: Subject<BannerData> = new Subject() let newBannerSubject: Subject<BannerData> = new Subject()
let onCarouselTransitionStart: BehaviorSubject<[HatnoteVisService, Visualisation]> = new BehaviorSubject([theme.current_service_theme.id_name, theme.current_visualisation]) let onCarouselTransitionStart: Subject<[HatnoteVisService, Visualisation]> = new Subject()
let onCarouselTransitionMid: BehaviorSubject<[HatnoteVisService, Visualisation]> = new BehaviorSubject([theme.current_service_theme.id_name, theme.current_visualisation]) let onCarouselTransitionMid: Subject<[HatnoteVisService, Visualisation]> = new Subject()
let onCarouselTransitionEnd: BehaviorSubject<[HatnoteVisService, Visualisation]> = new BehaviorSubject([theme.current_service_theme.id_name, theme.current_visualisation]) let onCarouselTransitionEnd: Subject<[HatnoteVisService, Visualisation]> = new Subject()
let showWebsocketInfoboxSubject: Subject<NetworkInfoboxData> = new Subject() let showWebsocketInfoboxSubject: Subject<NetworkInfoboxData> = new Subject()
let updateDatabaseInfoSubject: Subject<DatabaseInfo> = new Subject() let updateDatabaseInfoSubject: Subject<DatabaseInfo> = new Subject()
let updateVersionSubject: Subject<[string,number]> = new Subject() let updateVersionSubject: Subject<[string,number]> = new Subject()
......
import {BloxbergTransformer} from "./bloxberg_transformer"; import {BloxbergTransformer} from "./bloxberg_transformer";
import {HatnoteAudio} from "../audio/hatnote_audio"; import {HatnoteAudio} from "../audio/hatnote_audio";
import {BehaviorSubject, Subject} from "rxjs"; import {Subject} from "rxjs";
import {BannerData, CircleData} from "../observable/model"; import {BannerData, CircleData} from "../observable/model";
import {BloxbergWebsocketData, KeeperWebsocketData, MinervaWebsocketData, WebsocketEventInfo} from "../websocket/model"; import {BloxbergWebsocketData, KeeperWebsocketData, MinervaWebsocketData, WebsocketEventInfo} from "../websocket/model";
import { import {
...@@ -24,8 +24,8 @@ export class EventBridge{ ...@@ -24,8 +24,8 @@ export class EventBridge{
private audio: HatnoteAudio | undefined; private audio: HatnoteAudio | undefined;
private newCircleSubject: Subject<CircleData>; private newCircleSubject: Subject<CircleData>;
private newBannerSubject: Subject<BannerData>; private newBannerSubject: Subject<BannerData>;
private onCarouselTransitionStart: BehaviorSubject<[HatnoteVisService, Visualisation]> private onCarouselTransitionStart: Subject<[HatnoteVisService, Visualisation]>
private onThemeHasChanged: BehaviorSubject<[HatnoteVisService, Visualisation]> private onThemeHasChanged: Subject<[HatnoteVisService, Visualisation]>
private eventBuffer: EventBuffer; private eventBuffer: EventBuffer;
private updateVersionSubject: Subject<[string,number]> private updateVersionSubject: Subject<[string,number]>
private _currentService: HatnoteVisService private _currentService: HatnoteVisService
...@@ -41,9 +41,9 @@ export class EventBridge{ ...@@ -41,9 +41,9 @@ export class EventBridge{
} }
constructor(audio: HatnoteAudio | undefined, newCircleSubject: Subject<CircleData>, newBanenrSubject: Subject<BannerData>, constructor(audio: HatnoteAudio | undefined, newCircleSubject: Subject<CircleData>, newBanenrSubject: Subject<BannerData>,
updateVersionSubject: Subject<[string,number]>, updateVersionSubject: Subject<[string,number]>,
onCarouselTransitionStart: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionStart: Subject<[HatnoteVisService, Visualisation]>,
onCarouselTransitionMid: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionMid: Subject<[HatnoteVisService, Visualisation]>,
onCarouselTransitionEnd: BehaviorSubject<[HatnoteVisService, Visualisation]>, onCarouselTransitionEnd: Subject<[HatnoteVisService, Visualisation]>,
settings_data: SettingsData) { settings_data: SettingsData) {
this.settings_data = settings_data this.settings_data = settings_data
this.event_delay_protection = settings_data.event_delay_protection this.event_delay_protection = settings_data.event_delay_protection
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment