Fixed and moved the w2g part

shared/js/ConnectionHandler.ts

@@ -22,7 +22,6 @@ import {tr, traj} from "./i18n/localize";
 import {md5} from "./crypto/md5";
 import {guid} from "./crypto/uid";
 import {PluginCmdRegistry} from "./connection/PluginCmdHandler";
-import {W2GPluginCmdHandler} from "./video-viewer/W2GPlugin";
 import {VoiceConnectionStatus, WhisperSessionInitializeData} from "./connection/VoiceConnection";
 import {getServerConnectionFactory} from "./connection/ConnectionFactory";
 import {WhisperSession} from "./voice/VoiceWhisper";
@@ -42,6 +41,7 @@ import {connectionHistory} from "tc-shared/connectionlog/History";
 import {ConnectParameters} from "tc-shared/ui/modal/connect/Controller";
 import {assertMainApplication} from "tc-shared/ui/utils";
 import {getDNSProvider} from "tc-shared/dns";
+import {W2GPluginCmdHandler} from "tc-shared/ui/modal/video-viewer/W2GPlugin";
 
 assertMainApplication();
 

shared/js/main.tsx

@@ -34,7 +34,6 @@ import {bookmarks} from "tc-shared/Bookmarks";
 import "svg-sprites/client-icons";
 import "../css/load-css"
 import "./proto";
-import "./video-viewer/Controller";
 import "./profiles/ConnectionProfile";
 import "./update/UpdaterWeb";
 import "./file/LocalIcons";
@@ -47,6 +46,7 @@ import "./media/Video";
 import "./ui/AppController";
 import "./ui/frames/menu-bar/MainMenu";
 import "./ui/modal/connect/Controller";
+import "./ui/modal/video-viewer/Controller";
 import "./ui/elements/ContextDivider";
 import "./ui/elements/Tab";
 import "./clientservice";

shared/js/text/bbcode/YoutubeController.ts

@@ -17,7 +17,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
 
 
 function handleIpcMessage(remoteId: string, broadcast: boolean, message: ChannelMessage) {
-    if(message.type === "bbcode-youtube") {
+    if(message.type === "w2g") {
         global_client_actions.fire("action_w2g", {
             videoUrl: message.data.videoUrl,
             handlerId: message.data.handlerId

shared/js/text/bbcode/renderer.tsx

@@ -10,7 +10,7 @@ import HTMLRenderer from "vendor/xbbcode/renderer/html";
 
 import "./emoji";
 import "./highlight";
-import "./YoutubeRenderer";
+import "./YoutubeController";
 import "./url";
 import "./image";
 

shared/js/tree/Client.ts

@@ -22,7 +22,6 @@ import * as hex from "../crypto/hex";
 import {ChannelTreeEntry, ChannelTreeEntryEvents} from "./ChannelTreeEntry";
 import {spawnClientVolumeChange, spawnMusicBotVolumeChange} from "../ui/modal/ModalChangeVolumeNew";
 import {spawnPermissionEditorModal} from "../ui/modal/permission/ModalPermissionEditor";
-import {W2GPluginCmdHandler} from "../video-viewer/W2GPlugin";
 import {global_client_actions} from "../events/GlobalEvents";
 import {ClientIcon} from "svg-sprites/client-icons";
 import {VoiceClient} from "../voice/VoiceClient";
@@ -31,6 +30,7 @@ import {ChannelTreeUIEvents} from "tc-shared/ui/tree/Definitions";
 import {VideoClient} from "tc-shared/connection/VideoConnection";
 import { tr } from "tc-shared/i18n/localize";
 import {EventClient} from "tc-shared/connectionlog/Definitions";
+import {W2GPluginCmdHandler} from "tc-shared/ui/modal/video-viewer/W2GPlugin";
 
 export enum ClientType {
     CLIENT_VOICE,

shared/js/ui/modal/video-viewer/Controller.ts

@@ -1,15 +1,15 @@
-import {LogCategory, logError, logWarn} from "../log";
+import {LogCategory, logError, logWarn} from "../../../log";
-import {EventHandler, Registry} from "../events";
+import {EventHandler, Registry} from "tc-events";
 import {VideoViewerEvents} from "./Definitions";
-import {ConnectionHandler} from "../ConnectionHandler";
+import {ConnectionHandler} from "../../../ConnectionHandler";
-import {W2GPluginCmdHandler, W2GWatcher, W2GWatcherFollower} from "../video-viewer/W2GPlugin";
+import {settings, Settings} from "../../../settings";
-import {settings, Settings} from "../settings";
+import {global_client_actions} from "../../../events/GlobalEvents";
-import {global_client_actions} from "../events/GlobalEvents";
+import {createErrorModal} from "../../../ui/elements/Modal";
-import {createErrorModal} from "../ui/elements/Modal";
+import {ModalController} from "../../../ui/react-elements/ModalDefinitions";
-import {ModalController} from "../ui/react-elements/ModalDefinitions";
 import {server_connections} from "tc-shared/ConnectionManager";
 import { tr, tra } from "tc-shared/i18n/localize";
 import {spawnModal} from "tc-shared/ui/react-elements/modal";
+import {W2GPluginCmdHandler, W2GWatcher, W2GWatcherFollower} from "tc-shared/ui/modal/video-viewer/W2GPlugin";
 
 const parseWatcherId = (id: string): { clientId: number, clientUniqueId: string} => {
     const [ clientIdString, clientUniqueId ] = id.split(" - ");

shared/js/ui/modal/video-viewer/Renderer.scss

@@ -1,5 +1,5 @@
-@import "../../css/static/mixin";
+@import "../../../../css/static/mixin";
-@import "../../css/static/properties";
+@import "../../../../css/static/properties";
 
 $sidebar-width: 20em;
 .outerContainer {

shared/js/ui/modal/video-viewer/W2GPlugin.ts

@@ -1,7 +1,7 @@
-import {PluginCmdHandler, PluginCommandInvoker} from "../connection/PluginCmdHandler";
-import {Event, Registry} from "../events";
 import {PlayerStatus} from "../video-viewer/Definitions";
 import { tr } from "tc-shared/i18n/localize";
+import {Registry, Event} from "tc-events";
+import {PluginCmdHandler, PluginCommandInvoker,} from "tc-shared/connection/PluginCmdHandler";
 
 export interface W2GEvents {
     notify_watcher_add: { watcher: W2GWatcher },

shared/js/ui/react-elements/modal/Registry.ts

@@ -21,7 +21,7 @@ function registerModal<T extends keyof ModalConstructorArguments>(modal: Registe
 
 registerModal({
     modalId: "video-viewer",
-    classLoader: async () => await import("tc-shared/video-viewer/Renderer"),
+    classLoader: async () => await import("tc-shared/ui/modal/video-viewer/Renderer"),
     popoutSupported: true
 });