TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Fixed some small errors

canary
WolverinDEV 2019-03-17 12:39:21 +01:00
parent 8322aeed65
commit 7186c684d9
5 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -5,6 +5,3 @@
[submodule "vendor/bbcode"] [submodule "vendor/bbcode"]
path = vendor/bbcode path = vendor/bbcode
url = https://github.com/WolverinDEV/Extendible-BBCode-Parser.git url = https://github.com/WolverinDEV/Extendible-BBCode-Parser.git
[submodule "vendor\\ua-parser-js"]
path = vendor\\ua-parser-js
url = https://github.com/WolverinDEV/ua-parser-js

24
shared/css/static/frame/SelectInfo.scss
View File

@ -1,15 +1,17 @@
.select_info_table { } .select_info_table {
.select_info_table tr { } tr {
.select_info_table tr td { td {
&:nth-child(1) { &:nth-child(1) {
font-weight: bold; font-weight: bold;
padding-right: 5px; padding-right: 5px;
min-width: max(35%, 20px); //min-width: max(35%, 20px);
} }
&:nth-child(2) { &:nth-child(2) {
min-width: max(75%, 40px); //min-width: max(75%, 40px);
word-break: break-word; word-break: break-word;
}
}
} }
} }

3
shared/js/load.ts
View File

@ -443,7 +443,6 @@ const loader_javascript = {
await loader.load_scripts([ await loader.load_scripts([
["vendor/bbcode/xbbcode.js"], ["vendor/bbcode/xbbcode.js"],
["vendor/moment/moment.js"], ["vendor/moment/moment.js"],
["vendor/ua-parser-js/dist/ua-parser.min.js"],
["https://webrtc.github.io/adapter/adapter-latest.js"] ["https://webrtc.github.io/adapter/adapter-latest.js"]
]); ]);
@ -665,7 +664,7 @@ const loader_style = {
async function load_templates() { async function load_templates() {
try { try {
const response = await $.ajax("templates.html" + (loader.cache_tag || ""); const response = await $.ajax("templates.html" + (loader.cache_tag || ""));
let node = document.createElement("html"); let node = document.createElement("html");
node.innerHTML = response; node.innerHTML = response;

9
shared/js/ui/client.ts
View File

@ -342,7 +342,7 @@ class ClientEntry {
name: tr("Kick client from channel"), name: tr("Kick client from channel"),
callback: () => { callback: () => {
createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), text => true, result => { createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), text => true, result => {
if(result) { if(typeof(result) !== 'boolean' || result) {
//TODO tr //TODO tr
console.log("Kicking client " + this.clientNickName() + " from channel with reason " + result); console.log("Kicking client " + this.clientNickName() + " from channel with reason " + result);
this.channelTree.client.serverConnection.send_command("clientkick", { this.channelTree.client.serverConnection.send_command("clientkick", {
@ -360,7 +360,7 @@ class ClientEntry {
name: tr("Kick client fom server"), name: tr("Kick client fom server"),
callback: () => { callback: () => {
createInputModal(tr("Kick client from server"), tr("Kick reason:<br>"), text => true, result => { createInputModal(tr("Kick client from server"), tr("Kick reason:<br>"), text => true, result => {
if(result) { if(typeof(result) !== 'boolean' || result) {
//TODO tr //TODO tr
console.log("Kicking client " + this.clientNickName() + " from server with reason " + result); console.log("Kicking client " + this.clientNickName() + " from server with reason " + result);
this.channelTree.client.serverConnection.send_command("clientkick", { this.channelTree.client.serverConnection.send_command("clientkick", {
@ -613,9 +613,6 @@ class ClientEntry {
this.updateClientIcon(); this.updateClientIcon();
if(variable.key =="client_channel_group_id" || variable.key == "client_servergroups") if(variable.key =="client_channel_group_id" || variable.key == "client_servergroups")
this.update_displayed_client_groups(); this.update_displayed_client_groups();
if(variable.key == "client_version") {
console.log(UAParser(variable.value));
}
} }
/* process updates after variables have been set */ /* process updates after variables have been set */
@ -1042,7 +1039,7 @@ class MusicClientEntry extends ClientEntry {
name: tr("Kick client from channel"), name: tr("Kick client from channel"),
callback: () => { callback: () => {
createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), text => true, result => { createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), text => true, result => {
if(result) { if(typeof(result) !== 'boolean' || result) {
console.log(tr("Kicking client %o from channel with reason %o"), this.clientNickName(), result); console.log(tr("Kicking client %o from channel with reason %o"), this.clientNickName(), result);
this.channelTree.client.serverConnection.send_command("clientkick", { this.channelTree.client.serverConnection.send_command("clientkick", {
clid: this.clientId(), clid: this.clientId(),

1
shared/js/ui/frames/SelectedItemInfo.ts
View File

@ -1,6 +1,5 @@
/// <reference path="../../client.ts" /> /// <reference path="../../client.ts" />
/// <reference path="../../../../vendor/bbcode/xbbcode.ts" /> /// <reference path="../../../../vendor/bbcode/xbbcode.ts" />
/// <reference path="../../../../vendor/ua-parser-js/src/ua-parser.d.ts" />
abstract class InfoManagerBase { abstract class InfoManagerBase {
private timers: NodeJS.Timer[] = []; private timers: NodeJS.Timer[] = [];