Implemented the Material Design and fixed some bugs (#33)
* cleaned up some files * Fundamental style update * Redesigned some style * fixed hostbanner popup * Removed old identity stuff * fixed close listener * Fixed changelog date * fixed release chat icons * fixed url * Fixed hostbanner * Uploaded missing images * Improved update handling * Improved script files * Fixed loading error and icon error * fixed Yes/No modal * Fixed loader issues with MS Edge * fixed modal style bug * Fixed control bar overflow for small devices * Improved error handling on identity creation * Logging generate error to terminal * fixed possible php error * fixed some possible loading errors when other files have'nt been already loaded. * removed debug message * Changed emsrcypten flags * Improved codec error handling * removed webassembly as required dependency * Improved and fixed channel tree issues * Improved the sliders * Removed unneeded files * fixed loader versions cache * second slight performance improved (dont animate elements anymore if they are not shown) * Fixed query visibility setting * not showing useless client infos for query clients * Added an auto reconnect system * Added a canceled message and increased reconnect interval * removed implemented todo * fixed repetitive channel names * Reworked the channel tree selected lines * Fixed channel tree names * Fixed name alignment * fixed the native client * added min width to the server select groups to avoid a disappearing effect on shrink * fixed bugged downloaded icons
This commit is contained in:
WolverinDEV
GitHub
parent
99d460d8bb
commit
664f8b2abd
107 changed files with 15714 additions and 26102 deletions
31
ChangeLog.md
31
ChangeLog.md
|
|
@ -1,4 +1,35 @@
|
|||
# Changelog:
|
||||
* **17.02.19**
|
||||
- Removed WebAssembly as dependency (Now working with MS Edge as well (but without audio))
|
||||
- Improved channel tree performance
|
||||
- Improved touch channel tree hierarchy (not selects the channel which had been actually touched)
|
||||
- Added the possibility to scroll on the control bar (required for super small devices)
|
||||
- Improved error handling within the codecs
|
||||
- Fixed the vertical sliders for touch devices
|
||||
- Added an effect on slider select/move
|
||||
- Fixed query visibility setting
|
||||
- Removed useless client infos for query clients
|
||||
- Added an auto reconnect system
|
||||
- Reworked the channel tree selected lines
|
||||
|
||||
* **15.02.19**
|
||||
- Fixed MS Edge loading/document issues
|
||||
- Fixed invalid pattern in the yes/no modal
|
||||
|
||||
* **11.02.19**
|
||||
- Added a detection to the loader to avoid cached files on updates
|
||||
|
||||
* **09.02.19**
|
||||
- Improved UI now using the material design framework based on bootstrap
|
||||
- Fixed several UI overflow or small screen issues
|
||||
- Improved permission editor performance
|
||||
- Added hash rate to identity improve
|
||||
- Merged CSS files in release mode
|
||||
- Fixed overlapping avatars
|
||||
|
||||
* **04.02.19**
|
||||
- Fixed channel permissions
|
||||
|
||||
* **27.01.19**
|
||||
- Made sounds configurable
|
||||
- Added option to mute sounds when output is muted
|
||||
|
|
|
|||
BIN
TeaWeb.zip
BIN
TeaWeb.zip
Binary file not shown.
|
|
@ -6,7 +6,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "") #Override some config values from the parent proje
|
|||
set(CMAKE_CXX_COMPILER "emcc")
|
||||
set(CMAKE_C_COMPILER "emcc")
|
||||
set(CMAKE_C_LINK_EXECUTABLE "emcc")
|
||||
set(CMAKE_CXX_FLAGS "-O2 --llvm-lto 1 --memory-init-file 0 -s WASM=1") #-s ASSERTIONS=2 -s ALLOW_MEMORY_GROWTH=1 -O3
|
||||
set(CMAKE_CXX_FLAGS "-O3 --llvm-lto 1 --memory-init-file 0 -s WASM=1 -s ASSERTIONS=1") # -s ALLOW_MEMORY_GROWTH=1 -O3
|
||||
set(CMAKE_VERBOSE_MAKEFILE ON)
|
||||
set(CMAKE_EXE_LINKER_FLAGS "-s EXTRA_EXPORTED_RUNTIME_METHODS='[\"ccall\", \"cwrap\", \"Pointer_stringify\"]'") #
|
||||
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
|
||||
|
|
@ -17,9 +17,5 @@ include_directories(libraries/tomcrypt/src/headers)
|
|||
include_directories(libraries/opus/include/)
|
||||
add_definitions(-DLTM_DESC)
|
||||
|
||||
#cmake .. -DCMAKE_CXX_COMPILER="emcc" -DCMAKE_C_COMPILER="emcc" -DCMAKE_C_LINK_EXECUTABLE="emcc"
|
||||
add_executable(TeaWeb-Identity identity/Identity.cpp identity/TeamSpeakIdentity.cpp)
|
||||
target_link_libraries(TeaWeb-Identity ${CMAKE_CURRENT_SOURCE_DIR}/libraries/tomcrypt/libtomcrypt.a ${CMAKE_CURRENT_SOURCE_DIR}/libraries/tommath/build/libtommathStatic.a)
|
||||
|
||||
add_executable(TeaWeb-Worker-Codec-Opus src/opus.cpp)
|
||||
target_link_libraries(TeaWeb-Worker-Codec-Opus ${CMAKE_CURRENT_SOURCE_DIR}/libraries/opus/.libs/libopus.a)
|
||||
|
|
|
|||
|
|
@ -1,458 +0,0 @@
|
|||
// Read an INI file into easy-to-access name/value pairs.
|
||||
|
||||
// inih and INIReader are released under the New BSD license (see LICENSE.txt).
|
||||
// Go to the project home page for more info:
|
||||
//
|
||||
// https://github.com/benhoyt/inih
|
||||
/* inih -- simple .INI file parser
|
||||
|
||||
inih is released under the New BSD license (see LICENSE.txt). Go to the project
|
||||
home page for more info:
|
||||
|
||||
https://github.com/benhoyt/inih
|
||||
|
||||
*/
|
||||
|
||||
#ifndef __INI_H__
|
||||
#define __INI_H__
|
||||
|
||||
/* Make this header file easier to include in C++ code */
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
/* Typedef for prototype of handler function. */
|
||||
typedef int (*ini_handler)(void* user, const char* section,
|
||||
const char* name, const char* value);
|
||||
|
||||
/* Typedef for prototype of fgets-style reader function. */
|
||||
typedef char* (*ini_reader)(char* str, int num, void* stream);
|
||||
|
||||
/* Parse given INI-style file. May have [section]s, name=value pairs
|
||||
(whitespace stripped), and comments starting with ';' (semicolon). Section
|
||||
is "" if name=value pair parsed before any section heading. name:value
|
||||
pairs are also supported as a concession to Python's configparser.
|
||||
|
||||
For each name=value pair parsed, call handler function with given user
|
||||
pointer as well as section, name, and value (data only valid for duration
|
||||
of handler call). Handler should return nonzero on success, zero on error.
|
||||
|
||||
Returns 0 on success, line number of first error on parse error (doesn't
|
||||
stop on first error), -1 on file open error, or -2 on memory allocation
|
||||
error (only when INI_USE_STACK is zero).
|
||||
*/
|
||||
int ini_parse(const char* filename, ini_handler handler, void* user);
|
||||
|
||||
/* Same as ini_parse(), but takes a FILE* instead of filename. This doesn't
|
||||
close the file when it's finished -- the caller must do that. */
|
||||
int ini_parse_file(FILE* file, ini_handler handler, void* user);
|
||||
|
||||
inline int ini_parse_message(const std::string& message, ini_handler handler, void* user);
|
||||
|
||||
/* Same as ini_parse(), but takes an ini_reader function pointer instead of
|
||||
filename. Used for implementing custom or string-based I/O. */
|
||||
int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
||||
void* user);
|
||||
|
||||
/* Nonzero to allow multi-line value parsing, in the style of Python's
|
||||
configparser. If allowed, ini_parse() will call the handler with the same
|
||||
name for each subsequent line parsed. */
|
||||
#ifndef INI_ALLOW_MULTILINE
|
||||
#define INI_ALLOW_MULTILINE 1
|
||||
#endif
|
||||
|
||||
/* Nonzero to allow a UTF-8 BOM sequence (0xEF 0xBB 0xBF) at the start of
|
||||
the file. See http://code.google.com/p/inih/issues/detail?id=21 */
|
||||
#ifndef INI_ALLOW_BOM
|
||||
#define INI_ALLOW_BOM 1
|
||||
#endif
|
||||
|
||||
/* Nonzero to allow inline comments (with valid inline comment characters
|
||||
specified by INI_INLINE_COMMENT_PREFIXES). Set to 0 to turn off and match
|
||||
Python 3.2+ configparser behaviour. */
|
||||
#ifndef INI_ALLOW_INLINE_COMMENTS
|
||||
#define INI_ALLOW_INLINE_COMMENTS 1
|
||||
#endif
|
||||
#ifndef INI_INLINE_COMMENT_PREFIXES
|
||||
#define INI_INLINE_COMMENT_PREFIXES ";"
|
||||
#endif
|
||||
|
||||
/* Nonzero to use stack, zero to use heap (malloc/free). */
|
||||
#ifndef INI_USE_STACK
|
||||
#define INI_USE_STACK 1
|
||||
#endif
|
||||
|
||||
/* Stop parsing on first error (default is to keep parsing). */
|
||||
#ifndef INI_STOP_ON_FIRST_ERROR
|
||||
#define INI_STOP_ON_FIRST_ERROR 0
|
||||
#endif
|
||||
|
||||
/* Maximum line length for any line in INI file. */
|
||||
#ifndef INI_MAX_LINE
|
||||
#define INI_MAX_LINE 200
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
/* inih -- simple .INI file parser
|
||||
|
||||
inih is released under the New BSD license (see LICENSE.txt). Go to the project
|
||||
home page for more info:
|
||||
|
||||
https://github.com/benhoyt/inih
|
||||
|
||||
*/
|
||||
|
||||
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <sstream>
|
||||
|
||||
#if !INI_USE_STACK
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#define MAX_SECTION 50
|
||||
#define MAX_NAME 50
|
||||
|
||||
/* Strip whitespace chars off end of given string, in place. Return s. */
|
||||
inline static char* rstrip(char* s)
|
||||
{
|
||||
char* p = s + strlen(s);
|
||||
while (p > s && isspace((unsigned char)(*--p)))
|
||||
*p = '\0';
|
||||
return s;
|
||||
}
|
||||
|
||||
/* Return pointer to first non-whitespace char in given string. */
|
||||
inline static char* lskip(const char* s)
|
||||
{
|
||||
while (*s && isspace((unsigned char)(*s)))
|
||||
s++;
|
||||
return (char*)s;
|
||||
}
|
||||
|
||||
/* Return pointer to first char (of chars) or inline comment in given string,
|
||||
or pointer to null at end of string if neither found. Inline comment must
|
||||
be prefixed by a whitespace character to register as a comment. */
|
||||
inline static char* find_chars_or_comment(const char* s, const char* chars)
|
||||
{
|
||||
#if INI_ALLOW_INLINE_COMMENTS
|
||||
int was_space = 0;
|
||||
while (*s && (!chars || !strchr(chars, *s)) &&
|
||||
!(was_space && strchr(INI_INLINE_COMMENT_PREFIXES, *s))) {
|
||||
was_space = isspace((unsigned char)(*s));
|
||||
s++;
|
||||
}
|
||||
#else
|
||||
while (*s && (!chars || !strchr(chars, *s))) {
|
||||
s++;
|
||||
}
|
||||
#endif
|
||||
return (char*)s;
|
||||
}
|
||||
|
||||
/* Version of strncpy that ensures dest (size bytes) is null-terminated. */
|
||||
inline static char* strncpy0(char* dest, const char* src, size_t size)
|
||||
{
|
||||
strncpy(dest, src, size);
|
||||
dest[size - 1] = '\0';
|
||||
return dest;
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
inline int ini_parse_stream(ini_reader reader, void* stream, ini_handler handler,
|
||||
void* user)
|
||||
{
|
||||
/* Uses a fair bit of stack (use heap instead if you need to) */
|
||||
#if INI_USE_STACK
|
||||
char line[INI_MAX_LINE];
|
||||
#else
|
||||
char* line;
|
||||
#endif
|
||||
char section[MAX_SECTION] = "";
|
||||
char prev_name[MAX_NAME] = "";
|
||||
|
||||
char* start;
|
||||
char* end;
|
||||
char* name;
|
||||
char* value;
|
||||
int lineno = 0;
|
||||
int error = 0;
|
||||
|
||||
#if !INI_USE_STACK
|
||||
line = (char*)malloc(INI_MAX_LINE);
|
||||
if (!line) {
|
||||
return -2;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Scan through stream line by line */
|
||||
while (reader(line, INI_MAX_LINE, stream) != NULL) {
|
||||
lineno++;
|
||||
|
||||
start = line;
|
||||
#if INI_ALLOW_BOM
|
||||
if (lineno == 1 && (unsigned char)start[0] == 0xEF &&
|
||||
(unsigned char)start[1] == 0xBB &&
|
||||
(unsigned char)start[2] == 0xBF) {
|
||||
start += 3;
|
||||
}
|
||||
#endif
|
||||
start = lskip(rstrip(start));
|
||||
|
||||
if (*start == ';' || *start == '#') {
|
||||
/* Per Python configparser, allow both ; and # comments at the
|
||||
start of a line */
|
||||
}
|
||||
#if INI_ALLOW_MULTILINE
|
||||
else if (*prev_name && *start && start > line) {
|
||||
|
||||
#if INI_ALLOW_INLINE_COMMENTS
|
||||
end = find_chars_or_comment(start, NULL);
|
||||
if (*end)
|
||||
*end = '\0';
|
||||
rstrip(start);
|
||||
#endif
|
||||
|
||||
/* Non-blank line with leading whitespace, treat as continuation
|
||||
of previous name's value (as per Python configparser). */
|
||||
if (!handler(user, section, prev_name, start) && !error)
|
||||
error = lineno;
|
||||
}
|
||||
#endif
|
||||
else if (*start == '[') {
|
||||
/* A "[section]" line */
|
||||
end = find_chars_or_comment(start + 1, "]");
|
||||
if (*end == ']') {
|
||||
*end = '\0';
|
||||
strncpy0(section, start + 1, sizeof(section));
|
||||
*prev_name = '\0';
|
||||
}
|
||||
else if (!error) {
|
||||
/* No ']' found on section line */
|
||||
error = lineno;
|
||||
}
|
||||
}
|
||||
else if (*start) {
|
||||
/* Not a comment, must be a name[=:]value pair */
|
||||
end = find_chars_or_comment(start, "=:");
|
||||
if (*end == '=' || *end == ':') {
|
||||
*end = '\0';
|
||||
name = rstrip(start);
|
||||
value = lskip(end + 1);
|
||||
#if INI_ALLOW_INLINE_COMMENTS
|
||||
end = find_chars_or_comment(value, NULL);
|
||||
if (*end)
|
||||
*end = '\0';
|
||||
#endif
|
||||
rstrip(value);
|
||||
|
||||
/* Valid name[=:]value pair found, call handler */
|
||||
strncpy0(prev_name, name, sizeof(prev_name));
|
||||
if (!handler(user, section, name, value) && !error)
|
||||
error = lineno;
|
||||
}
|
||||
else if (!error) {
|
||||
/* No '=' or ':' found on name[=:]value line */
|
||||
error = lineno;
|
||||
}
|
||||
}
|
||||
|
||||
#if INI_STOP_ON_FIRST_ERROR
|
||||
if (error)
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !INI_USE_STACK
|
||||
free(line);
|
||||
#endif
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
inline int ini_parse_file(FILE* file, ini_handler handler, void* user)
|
||||
{
|
||||
return ini_parse_stream((ini_reader)fgets, file, handler, user);
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
inline int ini_parse_message(const std::string& message, ini_handler handler, void* user)
|
||||
{
|
||||
std::istringstream stream(message);
|
||||
return ini_parse_stream((ini_reader) [](char* str, int num, void* ptrStream) {
|
||||
auto stream = (std::istringstream*) ptrStream;
|
||||
stream->getline(str, num);
|
||||
return !!*stream ? str : nullptr;
|
||||
}, &stream, handler, user);
|
||||
}
|
||||
|
||||
/* See documentation in header file. */
|
||||
inline int ini_parse(const char* filename, ini_handler handler, void* user)
|
||||
{
|
||||
FILE* file;
|
||||
int error;
|
||||
|
||||
file = fopen(filename, "r");
|
||||
if (!file)
|
||||
return -1;
|
||||
error = ini_parse_file(file, handler, user);
|
||||
fclose(file);
|
||||
return error;
|
||||
}
|
||||
|
||||
#endif /* __INI_H__ */
|
||||
|
||||
|
||||
#ifndef __INIREADER_H__
|
||||
#define __INIREADER_H__
|
||||
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
|
||||
// Read an INI file into easy-to-access name/value pairs. (Note that I've gone
|
||||
// for simplicity here rather than speed, but it should be pretty decent.)
|
||||
class INIReader
|
||||
{
|
||||
public:
|
||||
// Empty Constructor
|
||||
INIReader() {};
|
||||
|
||||
// Construct INIReader and parse given filename. See ini.h for more info
|
||||
// about the parsing.
|
||||
INIReader(std::string filename, bool raw = false);
|
||||
|
||||
// Return the result of ini_parse(), i.e., 0 on success, line number of
|
||||
// first error on parse error, or -1 on file open error.
|
||||
int ParseError() const;
|
||||
|
||||
// Return the list of sections found in ini file
|
||||
std::set<std::string> Sections();
|
||||
|
||||
// Get a string value from INI file, returning default_value if not found.
|
||||
std::string Get(std::string section, std::string name,
|
||||
std::string default_value);
|
||||
|
||||
// Get an integer (long) value from INI file, returning default_value if
|
||||
// not found or not a valid integer (decimal "1234", "-1234", or hex "0x4d2").
|
||||
long GetInteger(std::string section, std::string name, long default_value);
|
||||
|
||||
// Get a real (floating point double) value from INI file, returning
|
||||
// default_value if not found or not a valid floating point value
|
||||
// according to strtod().
|
||||
double GetReal(std::string section, std::string name, double default_value);
|
||||
|
||||
// Get a boolean value from INI file, returning default_value if not found or if
|
||||
// not a valid true/false value. Valid true values are "true", "yes", "on", "1",
|
||||
// and valid false values are "false", "no", "off", "0" (not case sensitive).
|
||||
bool GetBoolean(std::string section, std::string name, bool default_value);
|
||||
|
||||
private:
|
||||
int _error;
|
||||
std::map<std::string, std::string> _values;
|
||||
std::set<std::string> _sections;
|
||||
static std::string MakeKey(std::string section, std::string name);
|
||||
static int ValueHandler(void* user, const char* section, const char* name,
|
||||
const char* value);
|
||||
};
|
||||
|
||||
#endif // __INIREADER_H__
|
||||
|
||||
|
||||
#ifndef __INIREADER__
|
||||
#define __INIREADER__
|
||||
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <cstdlib>
|
||||
|
||||
using std::string;
|
||||
|
||||
inline INIReader::INIReader(string data, bool raw)
|
||||
{
|
||||
if(raw)
|
||||
_error = ini_parse_message(data, ValueHandler, this);
|
||||
else
|
||||
_error = ini_parse(data.c_str(), ValueHandler, this);
|
||||
}
|
||||
|
||||
inline int INIReader::ParseError() const
|
||||
{
|
||||
return _error;
|
||||
}
|
||||
|
||||
inline std::set<string> INIReader::Sections()
|
||||
{
|
||||
return _sections;
|
||||
}
|
||||
|
||||
inline string INIReader::Get(string section, string name, string default_value)
|
||||
{
|
||||
string key = MakeKey(section, name);
|
||||
return _values.count(key) ? _values[key] : default_value;
|
||||
}
|
||||
|
||||
inline long INIReader::GetInteger(string section, string name, long default_value)
|
||||
{
|
||||
string valstr = Get(section, name, "");
|
||||
const char* value = valstr.c_str();
|
||||
char* end;
|
||||
// This parses "1234" (decimal) and also "0x4D2" (hex)
|
||||
long n = strtol(value, &end, 0);
|
||||
return end > value ? n : default_value;
|
||||
}
|
||||
|
||||
inline double INIReader::GetReal(string section, string name, double default_value)
|
||||
{
|
||||
string valstr = Get(section, name, "");
|
||||
const char* value = valstr.c_str();
|
||||
char* end;
|
||||
double n = strtod(value, &end);
|
||||
return end > value ? n : default_value;
|
||||
}
|
||||
|
||||
inline bool INIReader::GetBoolean(string section, string name, bool default_value)
|
||||
{
|
||||
string valstr = Get(section, name, "");
|
||||
// Convert to lower case to make string comparisons case-insensitive
|
||||
std::transform(valstr.begin(), valstr.end(), valstr.begin(), ::tolower);
|
||||
if (valstr == "true" || valstr == "yes" || valstr == "on" || valstr == "1")
|
||||
return true;
|
||||
else if (valstr == "false" || valstr == "no" || valstr == "off" || valstr == "0")
|
||||
return false;
|
||||
else
|
||||
return default_value;
|
||||
}
|
||||
|
||||
inline string INIReader::MakeKey(string section, string name)
|
||||
{
|
||||
string key = section + "=" + name;
|
||||
// Convert to lower case to make section/name lookups case-insensitive
|
||||
std::transform(key.begin(), key.end(), key.begin(), ::tolower);
|
||||
return key;
|
||||
}
|
||||
|
||||
inline int INIReader::ValueHandler(void* user, const char* section, const char* name,
|
||||
const char* value)
|
||||
{
|
||||
INIReader* reader = (INIReader*)user;
|
||||
string key = MakeKey(section, name);
|
||||
if (reader->_values[key].size() > 0)
|
||||
reader->_values[key] += "\n";
|
||||
reader->_values[key] += value;
|
||||
reader->_sections.insert(section);
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif // __INIREADER__
|
||||
|
|
@ -1,283 +0,0 @@
|
|||
#include "Identity.h"
|
||||
#include <iostream>
|
||||
#include "base64.h"
|
||||
|
||||
#define SHA_DIGEST_LENGTH 20
|
||||
#define ECC_TYPE_INDEX 5
|
||||
|
||||
static const char *TSKEY =
|
||||
"b9dfaa7bee6ac57ac7b65f1094a1c155"
|
||||
"e747327bc2fe5d51c512023fe54a2802"
|
||||
"01004e90ad1daaae1075d53b7d571c30"
|
||||
"e063b5a62a4a017bb394833aa0983e6e";
|
||||
|
||||
using namespace std;
|
||||
|
||||
inline int SHA1(const char* input, size_t length, char* result) {
|
||||
hash_state ctx = {};
|
||||
if (sha1_init(&ctx) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_process(&ctx, (uint8_t*) input, length) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_done(&ctx, (uint8_t*) result) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int decriptIdentity(char *data, uint32_t length) {
|
||||
int dataSize = std::min((uint32_t) 100, length);
|
||||
for (int i = 0; i < dataSize; i++) {
|
||||
data[i] ^= TSKEY[i];
|
||||
}
|
||||
|
||||
char hash[SHA_DIGEST_LENGTH];
|
||||
//if(SHA1(data + 20, strlen(data + 20), hash) < 0) return -1;
|
||||
|
||||
hash_state ctx = {};
|
||||
if (sha1_init(&ctx) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_process(&ctx, (uint8_t*)data + 20, strlen(data + 20)) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_done(&ctx, (uint8_t*)hash) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
|
||||
|
||||
for (int i = 0; i < 20; i++) {
|
||||
data[i] ^= hash[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int encriptIdentity(char *data, uint32_t length) {
|
||||
char hash[SHA_DIGEST_LENGTH];
|
||||
//if(SHA1(data, length, hash) < 0) return -1;
|
||||
|
||||
hash_state ctx;
|
||||
if (sha1_init(&ctx) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_process(&ctx, (uint8_t*)data + 20, strlen(data + 20)) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
if (sha1_done(&ctx, (uint8_t*)hash) != CRYPT_OK)
|
||||
{ return -1; }
|
||||
|
||||
|
||||
for (int i = 0; i < 20; i++) {
|
||||
data[i] ^= hash[i];
|
||||
}
|
||||
|
||||
int dataSize = std::min((uint32_t) 100, length);
|
||||
for (int i = 0; i < dataSize; i++) {
|
||||
data[i] ^= TSKEY[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
namespace ts {
|
||||
Identity* Identity::createNew() {
|
||||
auto result = new Identity();
|
||||
|
||||
prng_state rndState = {};
|
||||
memset(&rndState, 0, sizeof(prng_state));
|
||||
int err;
|
||||
|
||||
result->keyPair = new ecc_key;
|
||||
|
||||
//cout << " -> " << find_prng("sprng") << endl;
|
||||
if((err = ecc_make_key_ex(&rndState, find_prng("sprng"), result->keyPair, <c_ecc_sets[ECC_TYPE_INDEX])) != CRYPT_OK){
|
||||
printf("Cant create a new identity (Keygen)\n");
|
||||
printf("Message: %s\n", error_to_string(err));
|
||||
delete result;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Identity* Identity::parse(const std::string& data, std::string& error) {
|
||||
int vindex = data.find('V');
|
||||
if(vindex <= 0) {
|
||||
error = "Invalid structure";
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto slevel = data.substr(0, vindex);
|
||||
if(slevel.find_first_not_of("0123456789") != std::string::npos) {
|
||||
error = "Invalid offset (" + slevel + ")";
|
||||
return nullptr;
|
||||
}
|
||||
mp_int keyOffset{};
|
||||
mp_init(&keyOffset);
|
||||
mp_read_radix(&keyOffset, slevel.data(), 10);
|
||||
|
||||
auto keyData = data.substr(vindex + 1);
|
||||
keyData = base64::decode(keyData);
|
||||
if(encriptIdentity(&keyData[0], keyData.length()) < 0) {
|
||||
error = "Could not decrypt key";
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto identity = new Identity(base64::decode(keyData), keyOffset, keyOffset);
|
||||
if(!identity->keyPair) {
|
||||
error = "Could not load key";
|
||||
delete identity;
|
||||
return nullptr;
|
||||
}
|
||||
printf("X: %s | %s\n", slevel.c_str(), identity->lastValidKeyOffsetString().c_str());
|
||||
return identity;
|
||||
}
|
||||
|
||||
Identity::Identity(const std::string& asnStruct, mp_int keyOffset, mp_int lastCheckedOffset) {
|
||||
this->keyOffset = keyOffset;
|
||||
this->lastCheckedOffset = lastCheckedOffset;
|
||||
importKey(asnStruct);
|
||||
|
||||
mp_init_copy(&this->keyOffset, &keyOffset);
|
||||
mp_init_copy(&this->lastCheckedOffset, &lastCheckedOffset);
|
||||
}
|
||||
|
||||
Identity::Identity() {
|
||||
mp_init_multi(&this->keyOffset, &this->lastCheckedOffset, nullptr);
|
||||
this->keyPair = nullptr;
|
||||
}
|
||||
|
||||
Identity::~Identity() {
|
||||
delete this->keyPair;
|
||||
this->keyPair = nullptr;
|
||||
|
||||
mp_clear_multi(&this->keyOffset, &this->lastCheckedOffset, nullptr);
|
||||
}
|
||||
|
||||
void Identity::importKey(std::string asnStruct) {
|
||||
this->keyPair = new ecc_key;
|
||||
int err;
|
||||
if((err = ecc_import_ex((const unsigned char *) asnStruct.data(), asnStruct.length(), this->keyPair, <c_ecc_sets[ECC_TYPE_INDEX])) != CRYPT_OK){
|
||||
delete this->keyPair;
|
||||
this->keyPair = nullptr;
|
||||
|
||||
printf("Cant import identity from asn structure\n");
|
||||
printf("Message: %s\n", error_to_string(err));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
std::string Identity::exportIdentity() {
|
||||
std::string data = privateKey();
|
||||
decriptIdentity((char *) data.data(), data.length());
|
||||
return this->lastValidKeyOffsetString() + "V" + base64_encode(data);
|
||||
}
|
||||
|
||||
std::string Identity::uid() {
|
||||
char buffer[SHA_DIGEST_LENGTH];
|
||||
auto key = this->publicKey();
|
||||
SHA1(key.data(), key.length(), buffer);
|
||||
return base64::encode(buffer, SHA_DIGEST_LENGTH);
|
||||
}
|
||||
|
||||
inline string hex(string input, char beg, char end){
|
||||
assert(end - beg == 16);
|
||||
|
||||
int len = input.length() * 2;
|
||||
char output[len];
|
||||
int idx = 0;
|
||||
for(int index = 0; index < input.length(); index++){
|
||||
char elm = input[index];
|
||||
output[idx++] = static_cast<char>(beg + ((elm >> 4) & 0x0F));
|
||||
output[idx++] = static_cast<char>(beg + ((elm & 0x0F) >> 0));
|
||||
}
|
||||
|
||||
return string(output, len);
|
||||
}
|
||||
|
||||
std::string Identity::avatarId() {
|
||||
return hex(base64::decode(this->uid()), 'a', 'q');
|
||||
}
|
||||
|
||||
std::string Identity::publicKey() {
|
||||
assert(this->keyPair);
|
||||
|
||||
ulong32 bufferLength = 1028;
|
||||
char buffer[bufferLength];
|
||||
ecc_export((unsigned char *) buffer, &bufferLength, PK_PUBLIC, this->keyPair);
|
||||
|
||||
return base64_encode(std::string(buffer, bufferLength));
|
||||
}
|
||||
|
||||
std::string Identity::privateKey() {
|
||||
assert(this->keyPair);
|
||||
|
||||
ulong32 bufferLength = 1028;
|
||||
char buffer[bufferLength];
|
||||
ecc_export((unsigned char *) buffer, &bufferLength, PK_PRIVATE, this->keyPair);
|
||||
|
||||
return base64_encode(std::string(buffer, bufferLength));
|
||||
}
|
||||
|
||||
ecc_key& Identity::getPrivateKey() {
|
||||
return *keyPair;
|
||||
}
|
||||
|
||||
#define MaxUlongString 20
|
||||
|
||||
bool Identity::improveSecurityLevel(int target) {
|
||||
auto publicKey = this->publicKey();
|
||||
char hashBuffer[publicKey.length() + MaxUlongString];
|
||||
memcpy(hashBuffer, publicKey.data(), publicKey.length());
|
||||
|
||||
if(mp_cmp(&this->lastCheckedOffset, &this->keyOffset) < 0)
|
||||
mp_copy(&this->keyOffset, &this->lastCheckedOffset);
|
||||
int best = getSecurityLevel(hashBuffer, publicKey.length(), this->lastCheckedOffset);
|
||||
while(true){
|
||||
if(best >= target) return true;
|
||||
|
||||
int currentLevel = getSecurityLevel(hashBuffer, publicKey.length(), this->lastCheckedOffset);
|
||||
if(currentLevel >= best){
|
||||
this->keyOffset = this->lastCheckedOffset;
|
||||
best = currentLevel;
|
||||
}
|
||||
mp_add_d(&this->lastCheckedOffset, 1, &this->lastCheckedOffset);
|
||||
}
|
||||
}
|
||||
|
||||
int Identity::getSecurityLevel() {
|
||||
auto length = publicKey().length();
|
||||
char hashBuffer[length + MaxUlongString];
|
||||
|
||||
auto publicKey = this->publicKey();
|
||||
memcpy(hashBuffer, publicKey.data(), publicKey.length());
|
||||
|
||||
return getSecurityLevel(hashBuffer, publicKey.length(), this->keyOffset);
|
||||
}
|
||||
|
||||
int Identity::getSecurityLevel(char *hashBuffer, size_t keyLength, mp_int offset) {
|
||||
char numBuffer[MaxUlongString];
|
||||
mp_todecimal(&offset, numBuffer);
|
||||
/*
|
||||
int numLen = 0;
|
||||
do {
|
||||
numBuffer[numLen] = '0' + (offset % 10);
|
||||
offset /= 10;
|
||||
numLen++;
|
||||
} while(offset > 0);
|
||||
for(int i = 0; i < numLen; i++)
|
||||
hashBuffer[keyLength + i] = numBuffer[numLen - (i + 1)];
|
||||
*/
|
||||
auto numLen = strlen(numBuffer);
|
||||
memcpy(&hashBuffer[keyLength], numBuffer, numLen);
|
||||
|
||||
char shaBuffer[SHA_DIGEST_LENGTH];
|
||||
SHA1(hashBuffer, keyLength + numLen, shaBuffer);
|
||||
|
||||
//Leading zero bits
|
||||
int zeroBits = 0;
|
||||
int i;
|
||||
for(i = 0; i < SHA_DIGEST_LENGTH; i++)
|
||||
if(shaBuffer[i] == 0) zeroBits += 8;
|
||||
else break;
|
||||
if(i < SHA_DIGEST_LENGTH)
|
||||
for(int bit = 0; bit < 8; bit++)
|
||||
if((shaBuffer[i] & (1 << bit)) == 0) zeroBits++;
|
||||
else break;
|
||||
return zeroBits;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <tomcrypt.h>
|
||||
#include <string>
|
||||
#include <tommath.h>
|
||||
|
||||
namespace ts {
|
||||
class Identity {
|
||||
inline std::string toString(const mp_int& num) {
|
||||
char buffer[1024];
|
||||
mp_todecimal(&num, buffer);
|
||||
return std::string(buffer);
|
||||
}
|
||||
public:
|
||||
static Identity* createNew();
|
||||
static Identity* parse(const std::string&, std::string&);
|
||||
|
||||
Identity(const std::string& asnStruct,mp_int keyOffset,mp_int lastCheckedOffset);
|
||||
~Identity();
|
||||
|
||||
bool valid(){ return keyPair != nullptr; }
|
||||
|
||||
std::string uid();
|
||||
std::string avatarId();
|
||||
|
||||
std::string publicKey();
|
||||
std::string privateKey();
|
||||
std::string exportIdentity();
|
||||
|
||||
ecc_key* getKeyPair(){
|
||||
return keyPair;
|
||||
}
|
||||
|
||||
ecc_key& getPrivateKey();
|
||||
|
||||
bool improveSecurityLevel(int target);
|
||||
int getSecurityLevel();
|
||||
|
||||
mp_int lastValidKeyOffset(){ return keyOffset; }
|
||||
mp_int lastTestedKeyOffset(){ return lastCheckedOffset; }
|
||||
|
||||
std::string lastValidKeyOffsetString(){
|
||||
return toString(this->lastValidKeyOffset());
|
||||
}
|
||||
|
||||
std::string lastTestedKeyOffsetString(){
|
||||
return toString(this->lastTestedKeyOffset());
|
||||
}
|
||||
private:
|
||||
Identity();
|
||||
|
||||
int getSecurityLevel(char* hasBuffer, size_t keyLength, mp_int offset);
|
||||
void importKey(std::string asn1);
|
||||
|
||||
ecc_key* keyPair = nullptr;
|
||||
mp_int keyOffset;
|
||||
mp_int lastCheckedOffset;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
#include <cstdio>
|
||||
#include <emscripten.h>
|
||||
#include <emscripten/bind.h>
|
||||
#include <tomcrypt.h>
|
||||
#include <cmath>
|
||||
#include <iostream>
|
||||
#include "Identity.h"
|
||||
#include "base64.h"
|
||||
#define INI_MAX_LINE 1024
|
||||
#include "INIReader.h"
|
||||
|
||||
using namespace emscripten;
|
||||
using namespace std;
|
||||
extern "C" {
|
||||
std::string errorMessage = "";
|
||||
|
||||
inline const char* cstr(const std::string& message) {
|
||||
auto buffer = (char*) malloc(message.length() + 1);
|
||||
cout << "Allocating at " << (void*) buffer << endl;
|
||||
buffer[message.length()] = '\0';
|
||||
memcpy(buffer, message.data(), message.length());
|
||||
return buffer;
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* last_error_message() {
|
||||
return cstr(errorMessage);
|
||||
};
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
void destroy_string(const char* str) {
|
||||
cout << "Deallocating at " << (void*) str << endl;
|
||||
if(str) free((void *) str);
|
||||
};
|
||||
|
||||
inline void clear_error() { errorMessage = ""; }
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
int tomcrypt_initialize() {
|
||||
init_LTM();
|
||||
if(register_prng(&sprng_desc) == -1) {
|
||||
printf("could not setup prng\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
if (register_cipher(&rijndael_desc) == -1) {
|
||||
printf("could not setup rijndael\n");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
cout << "Initialized!" << endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
void* parse_identity(const char* input) {
|
||||
cout << "Got messsage: " << input << endl;
|
||||
clear_error();
|
||||
return ts::Identity::parse(input, errorMessage);
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
void* parse_identity_file(const char* input) {
|
||||
clear_error();
|
||||
INIReader reader(input, true);
|
||||
if(reader.ParseError() != 0) {
|
||||
errorMessage = "Could not parse file " + to_string(reader.ParseError());
|
||||
return nullptr;
|
||||
}
|
||||
auto identity = reader.Get("Identity", "identity", "");
|
||||
if(!identity.empty() && identity[0] == '"')
|
||||
identity = identity.substr(1);
|
||||
if(!identity.empty() && identity.back() == '"')
|
||||
identity = identity.substr(0, identity.length() - 1);
|
||||
if(identity.empty()) {
|
||||
errorMessage = "Mussing identity value at Identity::identity";
|
||||
return nullptr;
|
||||
}
|
||||
return ts::Identity::parse(identity, errorMessage);
|
||||
}
|
||||
|
||||
#define IDENTITIEFY(_ret) \
|
||||
auto identity = dynamic_cast<ts::Identity*>((ts::Identity*) ptrIdentity); \
|
||||
if(!identity) { \
|
||||
errorMessage = "Invalid identity pointer!"; \
|
||||
return _ret; \
|
||||
}
|
||||
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
void delete_identity(void* ptrIdentity) {
|
||||
IDENTITIEFY(;);
|
||||
delete identity;
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* identity_security_level(void* ptrIdentity) {
|
||||
IDENTITIEFY("");
|
||||
return cstr(std::to_string(identity->getSecurityLevel()));
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* identity_export(void* ptrIdentity) {
|
||||
IDENTITIEFY("");
|
||||
return cstr(identity->exportIdentity());
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* identity_key_public(void* ptrIdentity) {
|
||||
IDENTITIEFY("");
|
||||
return cstr(identity->publicKey());
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* identity_uid(void* ptrIdentity) {
|
||||
IDENTITIEFY("");
|
||||
return cstr(identity->uid());
|
||||
}
|
||||
|
||||
EMSCRIPTEN_KEEPALIVE
|
||||
const char* identity_sign(void* ptrIdentity, const char* message, int length) {
|
||||
IDENTITIEFY("");
|
||||
|
||||
ulong32 bufferLength = 128;
|
||||
char signBuffer[bufferLength];
|
||||
|
||||
prng_state rndState = {};
|
||||
memset(&rndState, 0, sizeof(prng_state));
|
||||
|
||||
auto state = ecc_sign_hash((const unsigned char*) message, length, reinterpret_cast<unsigned char *>(signBuffer), &bufferLength, &rndState, find_prng("sprng"), identity->getKeyPair());
|
||||
if(state != CRYPT_OK) {
|
||||
errorMessage = "Could not sign message (" + std::string(error_to_string(state)) + "|" + std::to_string(state) + ")";
|
||||
return "";
|
||||
}
|
||||
|
||||
return cstr(base64::encode(signBuffer, bufferLength));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <tomcrypt.h>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
namespace base64 {
|
||||
/**
|
||||
* Encodes a given string in Base64
|
||||
* @param input The input string to Base64-encode
|
||||
* @param inputSize The size of the input to decode
|
||||
* @return A Base64-encoded version of the encoded string
|
||||
*/
|
||||
inline std::string encode(const char* input, const unsigned long inputSize) {
|
||||
auto outlen = static_cast<unsigned long>(inputSize + (inputSize / 3.0) + 16);
|
||||
auto outbuf = new unsigned char[outlen]; //Reserve output memory
|
||||
if(base64_encode((unsigned char*) input, inputSize, outbuf, &outlen) != CRYPT_OK){
|
||||
std::cerr << "Invalid input '" << input << "'" << std::endl;
|
||||
return "";
|
||||
}
|
||||
std::string ret((char*) outbuf, outlen);
|
||||
delete[] outbuf;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Encodes a given string in Base64
|
||||
* @param input The input string to Base64-encode
|
||||
* @return A Base64-encoded version of the encoded string
|
||||
*/
|
||||
inline std::string encode(const std::string& input) { return encode(input.c_str(), input.size()); }
|
||||
|
||||
|
||||
/**
|
||||
* Decodes a Base64-encoded string.
|
||||
* @param input The input string to decode
|
||||
* @return A string (binary) that represents the Base64-decoded data of the input
|
||||
*/
|
||||
inline std::string decode(const char* input, ulong32 size) {
|
||||
auto out = new unsigned char[size];
|
||||
if(base64_strict_decode((unsigned char*) input, size, out, &size) != CRYPT_OK){
|
||||
std::cerr << "Invalid base 64 string '" << input << "'" << std::endl;
|
||||
return "";
|
||||
}
|
||||
std::string ret((char*) out, size);
|
||||
delete[] out;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Decodes a Base64-encoded string.
|
||||
* @param input The input string to decode
|
||||
* @return A string (binary) that represents the Base64-decoded data of the input
|
||||
*/
|
||||
inline std::string decode(const std::string& input) { return decode(input.c_str(), input.size()); }
|
||||
}
|
||||
inline std::string base64_encode(const char* input, const unsigned long inputSize) { return base64::encode(input, inputSize); }
|
||||
inline std::string base64_encode(const std::string& input) { return base64::encode(input.c_str(), input.size()); }
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if ! [ -d generated ]; then
|
||||
mkdir generated
|
||||
fi
|
||||
OPUS_FN="'_free','_malloc','_opus_strerror','_opus_get_version_string','_opus_encoder_get_size','_opus_encoder_init','_opus_encode','_opus_encode_float','_opus_encoder_ctl','_opus_decoder_get_size','_opus_decoder_init','_opus_decode','_opus_decode_float','_opus_decoder_ctl','_opus_packet_get_nb_samples'"
|
||||
cd libraries/opus/
|
||||
|
||||
git checkout v1.1.2
|
||||
./autogen.sh
|
||||
emconfigure ./configure --disable-extra-programs --disable-doc --disable-rtcd
|
||||
emmake make
|
||||
cd ../../
|
||||
emcc -o generated/libopus.js -O3 --memory-init-file 0 --closure 1 -s NO_FILESYSTEM=1 -s MODULARIZE=1 -s EXPORTED_FUNCTIONS="[$OPUS_FN]" libraries/opus/.libs/libopus.a
|
||||
|
||||
|
|
@ -242,6 +242,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
function setup_forum_auth() {
|
||||
getXF(); /* Initialize XF */
|
||||
}
|
||||
|
||||
if(!$_INCLIDE_ONLY) {
|
||||
$app = getXF();
|
||||
if(!$app) return;
|
||||
|
|
|
|||
30
files.php
30
files.php
|
|
@ -37,13 +37,37 @@
|
|||
"path" => "js/workers/",
|
||||
"local-path" => "./shared/js/workers/"
|
||||
],
|
||||
[ /* shared css files */
|
||||
[ /* shared developer single css files */
|
||||
"type" => "css",
|
||||
"search-pattern" => "/.*\.css$/",
|
||||
"build-target" => "dev",
|
||||
|
||||
"path" => "css/",
|
||||
"local-path" => "./shared/css/"
|
||||
],
|
||||
[ /* shared release css files */
|
||||
"type" => "css",
|
||||
"search-pattern" => "/.*\.css$/",
|
||||
"build-target" => "rel",
|
||||
|
||||
"path" => "css/",
|
||||
"local-path" => "./shared/generated/"
|
||||
],
|
||||
[ /* shared release css files */
|
||||
"type" => "css",
|
||||
"search-pattern" => "/.*\.css$/",
|
||||
"build-target" => "rel",
|
||||
|
||||
"path" => "css/loader/",
|
||||
"local-path" => "./shared/css/loader/"
|
||||
],
|
||||
[ /* shared release css files */
|
||||
"type" => "css",
|
||||
"search-pattern" => "/.*\.css$/",
|
||||
"build-target" => "dev|rel",
|
||||
|
||||
"path" => "css/",
|
||||
"local-path" => "./shared/css/"
|
||||
"path" => "css/theme/",
|
||||
"local-path" => "./shared/css/theme/"
|
||||
],
|
||||
[ /* shared sound files */
|
||||
"type" => "wav",
|
||||
|
|
|
|||
0
out.d.ts
vendored
0
out.d.ts
vendored
|
|
@ -10,6 +10,7 @@
|
|||
"dtsgen": "node tools/dtsgen/index.js",
|
||||
"trgen": "node tools/trgen/index.js",
|
||||
"ttsc": "ttsc",
|
||||
"csso": "csso",
|
||||
"rebuild-structure-web-dev": "php files.php generate web dev"
|
||||
},
|
||||
"author": "TeaSpeak (WolverinDEV)",
|
||||
|
|
@ -22,6 +23,7 @@
|
|||
"@types/node": "^9.4.6",
|
||||
"@types/sha256": "^0.2.0",
|
||||
"@types/websocket": "0.0.38",
|
||||
"csso-cli": "^2.0.2",
|
||||
"electron": "^3.0.2",
|
||||
"gulp": "^3.9.1",
|
||||
"sass": "^1.14.1",
|
||||
|
|
@ -37,5 +39,8 @@
|
|||
"bugs": {
|
||||
"url": "https://github.com/TeaSpeak/TeaWeb/issues"
|
||||
},
|
||||
"homepage": "https://www.teaspeak.de"
|
||||
"homepage": "https://www.teaspeak.de",
|
||||
"dependencies": {
|
||||
"clean-css": "^4.2.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ source "${BASEDIR}/resolve_commands.sh"
|
|||
cd "$BASEDIR/../"
|
||||
|
||||
function generate_link() {
|
||||
if [ ! -L $2 ] || [ "${BASH_ARGV[0]}" == "force" ]; then
|
||||
if [ -e $2 ] || [ -L $2 ]; then
|
||||
if [[ ! -L $2 ]] || [[ "${BASH_ARGV[0]}" == "force" ]]; then
|
||||
if [[ -e $2 ]] || [[ -L $2 ]]; then
|
||||
rm $2
|
||||
fi
|
||||
ln -rs $1 $2
|
||||
|
|
@ -42,9 +42,9 @@ echo "Generated shared declarations"
|
|||
|
||||
#Now build the merged declaration for the shared project
|
||||
#Link the declaration files (All interface declarations should be equal!)
|
||||
if [ ! -d shared/declarations ]; then
|
||||
if [[ ! -d shared/declarations ]]; then
|
||||
mkdir shared/declarations
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to create directory shared/declarations"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,26 +8,26 @@ TMP_DIR_NAME="tmp"
|
|||
BASEDIR=$(dirname "$0")
|
||||
cd "$BASEDIR/../"
|
||||
|
||||
if [ "$#" -ne 3 ]; then
|
||||
if [[ "$#" -ne 3 ]]; then
|
||||
echo "Illegal number of parameters (url | channel | required version)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d client-api/environment/ui-files/ ]; then
|
||||
if [[ ! -d client&&pi/environment/ui-files/ ]]; then
|
||||
echo "Missing UI Files"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "${teaclient_deploy_secret}" == "" ]; then
|
||||
if [[ "${teaclient_deploy_secret}" == "" ]]; then
|
||||
echo "Missing deploy secret!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -e "${TMP_FILE_NAME}" ]; then
|
||||
if [[ -e "${TMP_FILE_NAME}" ]]; then
|
||||
echo "Temp file already exists!"
|
||||
echo "Deleting it!"
|
||||
rm ${TMP_FILE_NAME}
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to delete file"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -39,9 +39,9 @@ echo "Git hash ${GIT_HASH} on version ${APPLICATION_VERSION} on channel $2"
|
|||
|
||||
#Packaging the app
|
||||
cd client-api/environment/ui-files/
|
||||
if [ -e ${TMP_DIR_NAME} ]; then
|
||||
if [[ -e ${TMP_DIR_NAME} ]]; then
|
||||
rm -r ${TMP_DIR_NAME}
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to remove temporary directory!"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -52,7 +52,7 @@ for file in $(find ${TMP_DIR_NAME} -name '*.php'); do
|
|||
echo "Evaluating php file $file"
|
||||
RESULT=$(php "${file}" 2> /dev/null)
|
||||
CODE=$?
|
||||
if [ ${CODE} -ne 0 ]; then
|
||||
if [[ ${CODE} -ne 0 ]]; then
|
||||
echo "Failed to evaluate php file $file!"
|
||||
echo "Return code $CODE"
|
||||
exit 1
|
||||
|
|
@ -63,7 +63,7 @@ done
|
|||
|
||||
cd ${TMP_DIR_NAME}
|
||||
tar chvzf ${TMP_FILE_NAME} *
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to pack file"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -87,9 +87,9 @@ RESP=$(curl \
|
|||
echo "$RESP"
|
||||
SUCCESS=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['success'])")
|
||||
|
||||
if [ ! "${SUCCESS}" == "True" ]; then
|
||||
if [[ ! "${SUCCESS}" == "True" ]]; then
|
||||
ERROR=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['error'])" 2>/dev/null)
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
ERROR=$(echo ${RESP} | python -c "import sys, json; print(json.load(sys.stdin)['msg'])" 2>/dev/null)
|
||||
fi
|
||||
echo "Failed to deploy build!"
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
response=$(git diff-index HEAD -- . ':!asm/libraries/' ':!package-lock.json' ':!vendor/')
|
||||
if [ "$response" != "" ]; then
|
||||
if [ "$1" == "sort-tag" ]; then
|
||||
if [[ "$response" != "" ]]; then
|
||||
if [[ "$1" == "sort-tag" ]]; then
|
||||
echo "0000000"
|
||||
fi
|
||||
if [ "$1" == "name" ]; then
|
||||
if [[ "$1" == "name" ]]; then
|
||||
echo "custom build"
|
||||
fi
|
||||
if [ "$1" == "file-name" ]; then
|
||||
if [[ "$1" == "file-name" ]]; then
|
||||
echo "custom"
|
||||
fi
|
||||
exit 1
|
||||
else
|
||||
if [ "$1" == "sort-tag" ]; then
|
||||
if [[ "$1" == "sort-tag" ]]; then
|
||||
echo "$(git rev-parse --short HEAD)"
|
||||
fi
|
||||
if [ "$1" == "name" ]; then
|
||||
if [[ "$1" == "name" ]]; then
|
||||
echo "$(git rev-parse --short HEAD)"
|
||||
fi
|
||||
if [ "$1" == "file-name" ]; then
|
||||
if [[ "$1" == "file-name" ]]; then
|
||||
echo "$(git rev-parse --short HEAD)"
|
||||
fi
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@ function execute_npm_command() {
|
|||
command_variable="command_$command_name"
|
||||
#echo "Variable names $command_variable"
|
||||
|
||||
if [ "${!command_variable}" == "" ]; then
|
||||
if [[ "${!command_variable}" == "" ]]; then
|
||||
node_bin=$(npm bin)
|
||||
#echo "Node root ${node_bin}"
|
||||
|
||||
if [ ! -e "${node_bin}/${command_name}" ]; then
|
||||
if [[ ! -e "${node_bin}/${command_name}" ]]; then
|
||||
echo "Could not find \"$command_name\" command"
|
||||
echo "May type npm install"
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
source `dirname $0`/resolve_commands.sh
|
||||
BASEDIR=$(dirname "$0")
|
||||
cd "$BASEDIR/../"
|
||||
source ./scripts/resolve_commands.sh
|
||||
|
||||
if [ "$1" == "development" ] || [ "$1" == "dev" ]; then
|
||||
if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then
|
||||
source_path="web/environment/development"
|
||||
type="development"
|
||||
elif [ "$1" == "release" ] || [ "$1" == "rel" ]; then
|
||||
elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then
|
||||
source_path="web/environment/release"
|
||||
type="release"
|
||||
else
|
||||
if [ $# -lt 1 ]; then
|
||||
if [[ $# -lt 1 ]]; then
|
||||
echo "Invalid argument count!"
|
||||
else
|
||||
echo "Invalid option $1"
|
||||
|
|
@ -22,14 +22,14 @@ fi
|
|||
|
||||
echo "Generating style files"
|
||||
npm run compile-sass
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to generate style files"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Generating web workers"
|
||||
npm run build-worker
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to build web workers"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -37,7 +37,7 @@ fi
|
|||
#Lets build some tools
|
||||
#dtsgen should be already build by build_declarations.sh
|
||||
./tools/build_trgen.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to build typescript translation generator"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -45,16 +45,16 @@ fi
|
|||
#Now lets build the declarations
|
||||
echo "Building declarations"
|
||||
./scripts/build_declarations.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to generate declarations"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$type" == "release" ]; then #Compile everything for release mode
|
||||
if [[ "$type" == "release" ]]; then #Compile everything for release mode
|
||||
#Compile the shared source first
|
||||
echo "Building shared source"
|
||||
./shared/generate_packed.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to build shared source"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -62,21 +62,21 @@ if [ "$type" == "release" ]; then #Compile everything for release mode
|
|||
#Now compile the web client itself
|
||||
echo "Building web client"
|
||||
./web/generate_packed.sh
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to build web client"
|
||||
exit 1
|
||||
fi
|
||||
elif [ "$type" == "development" ]; then
|
||||
elif [[ "$type" == "development" ]]; then
|
||||
echo "Building shared source"
|
||||
execute_ttsc -p ./shared/tsconfig/tsconfig.json
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to compile shared sources"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Building web client source"
|
||||
execute_ttsc -p ./web/tsconfig/tsconfig.json
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to compile web sources"
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -84,7 +84,7 @@ fi
|
|||
|
||||
echo "Generating environment"
|
||||
php files.php generate web ${type}
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to generate environment"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
BASEDIR=$(dirname "$0")
|
||||
cd "$BASEDIR/../"
|
||||
|
||||
if [ "$1" == "development" ] || [ "$1" == "dev" ]; then
|
||||
if [[ "$1" == "development" ]] || [[ "$1" == "dev" ]]; then
|
||||
source_path="web/environment/development"
|
||||
type="development"
|
||||
elif [ "$1" == "release" ] || [ "$1" == "rel" ]; then
|
||||
elif [[ "$1" == "release" ]] || [[ "$1" == "rel" ]]; then
|
||||
source_path="web/environment/release"
|
||||
type="release"
|
||||
else
|
||||
if [ $# -lt 1 ]; then
|
||||
if [[ $# -lt 1 ]]; then
|
||||
echo "Invalid argument count!"
|
||||
else
|
||||
echo "Invalid option $1"
|
||||
|
|
@ -19,14 +19,14 @@ else
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d "$source_path" ]; then
|
||||
if [[ ! -d "$source_path" ]]; then
|
||||
echo "Could not find environment! ($source_path)"
|
||||
echo "Please generate it first!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
response=$(git diff-index HEAD -- . ':!asm/libraries/' ':!package-lock.json' ':!vendor/')
|
||||
if [ "$response" != "" ]; then
|
||||
if [[ "$response" != "" ]]; then
|
||||
echo "You're using a private modified build!"
|
||||
echo "Cant assign git hash!"
|
||||
NAME="TeaWeb.zip"
|
||||
|
|
@ -34,7 +34,7 @@ else
|
|||
NAME="TeaWeb-$(git rev-parse --short HEAD).zip"
|
||||
fi
|
||||
|
||||
if [ -e ${NAME} ]; then
|
||||
if [[ -e ${NAME} ]]; then
|
||||
echo "Found old file. Deleting it."
|
||||
rm -r ${NAME}
|
||||
fi
|
||||
|
|
@ -43,7 +43,7 @@ current_path=$(pwd)
|
|||
cd "$source_path"
|
||||
zip -9 -r ${NAME} *
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to package environment!"
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,396 +0,0 @@
|
|||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.align_row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.align_column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.icon_loading {
|
||||
border: 2px solid #f3f3f3; /* Light grey */
|
||||
border-top: 2px solid #3498db; /* Blue */
|
||||
border-radius: 50%;
|
||||
animation: spin 2s linear infinite;
|
||||
|
||||
width: 14px!important;
|
||||
height: 14px!important;
|
||||
}
|
||||
|
||||
.avatar_loading {
|
||||
border: 2px solid #f3f3f3; /* Light grey */
|
||||
border-top: 2px solid #3498db; /* Blue */
|
||||
border-radius: 50%;
|
||||
animation: spin 2s linear infinite;
|
||||
|
||||
width: 14px!important;
|
||||
height: 14px!important;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% { transform: rotate(0deg); }
|
||||
100% { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
.select_info {
|
||||
font-family: Arial;
|
||||
font-size: 12px;
|
||||
/*white-space: pre;*/
|
||||
line-height: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* The Modal (background) */
|
||||
.modal {
|
||||
display: none; /* Hidden by default */
|
||||
position: fixed; /* Stay in place */
|
||||
z-index: 1; /* Sit on top */
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%; /* Full width */
|
||||
height: 100%; /* Full height */
|
||||
overflow: auto; /* Enable scroll if needed */
|
||||
background-color: rgb(0,0,0); /* Fallback color */
|
||||
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
|
||||
}
|
||||
|
||||
/* Modal Header */
|
||||
.modal-header {
|
||||
padding: 2px 16px;
|
||||
min-height: 30px;
|
||||
vertical-align: middle;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
border: grey solid;
|
||||
border-width: 0 0 1px 0;
|
||||
|
||||
background-color: lightgreen;
|
||||
}
|
||||
|
||||
/* Modal Body */
|
||||
.modal-body:not(:empty) {
|
||||
display: flex;
|
||||
padding: 2px 16px;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
}
|
||||
|
||||
/* Modal Footer */
|
||||
.modal-footer:not(:empty) {
|
||||
padding: 2px 16px;
|
||||
}
|
||||
|
||||
/* The Close Button */
|
||||
.close {
|
||||
color: #aaa;
|
||||
float: right;
|
||||
font-size: 28px;
|
||||
font-weight: bold;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 4px;
|
||||
}
|
||||
|
||||
.close:hover,
|
||||
.close:focus {
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Modal Content */
|
||||
.modal-content:not(:empty) {
|
||||
position: absolute;
|
||||
display: inline-flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
background-color: #fefefe;
|
||||
margin: auto;
|
||||
padding: 0;
|
||||
border: 2px solid #888;
|
||||
width: auto;
|
||||
max-width: 90%;
|
||||
box-shadow: 0 4px 15px 0 rgba(0,0,0,0.2), 2px 6px 20px 0 rgba(0,0,0,0.19);
|
||||
animation-name: modalFlyIn;
|
||||
animation-duration: 0.4s;
|
||||
top: 10%;
|
||||
max-height: 80%;
|
||||
|
||||
left: 0;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
/* Add Animation */
|
||||
@keyframes modalFlyIn {
|
||||
from {top: 0%; opacity: 0}
|
||||
to {top: 10%; opacity: 1}
|
||||
}
|
||||
|
||||
.channel_perm_tbl input {
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
.channel_perm_tbl .key {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
.channel_general_properties .value {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
html {
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
border: unset;
|
||||
display: unset;
|
||||
}
|
||||
|
||||
.modal-head-error {
|
||||
background: darkred;
|
||||
|
||||
font-family: Arial;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.modal-button-group {
|
||||
|
||||
}
|
||||
|
||||
.modal-button-group button {
|
||||
width: 100px;
|
||||
margin-right: 5px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.modal-button-group button:last-of-type {
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
.invalid_input {
|
||||
border-color: red;
|
||||
}
|
||||
|
||||
.GroupBox {
|
||||
border: gray solid;
|
||||
border-width: 2px;
|
||||
border-radius: 0px 6px 6px 6px;
|
||||
}
|
||||
|
||||
.vad_vad_bar {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
.vad_vad_bar .vad_vad_bar_filler {
|
||||
background-color: green;
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
/* The slider itself */
|
||||
.vad_vad_slider {
|
||||
margin: 0px;
|
||||
background-color: gray;
|
||||
-webkit-appearance: none; /* Override default CSS styles */
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
outline: none;
|
||||
opacity: 0.7; /* Set transparency (for mouse-over effects on hover) */
|
||||
-webkit-transition: .2s; /* 0.2 seconds transition on hover */
|
||||
transition: opacity .2s;
|
||||
}
|
||||
|
||||
/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */
|
||||
.vad_vad_slider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none; /* Override default look */
|
||||
appearance: none;
|
||||
width: 2px; /* Set a specific slider handle width */
|
||||
height: 20px; /* Slider handle height */
|
||||
background: #000000; /* Green background */
|
||||
cursor: pointer; /* Cursor on hover */
|
||||
}
|
||||
|
||||
.vad_vad_slider::-moz-range-thumb {
|
||||
width: 2px; /* Set a specific slider handle width */
|
||||
height: 100%; /* Slider handle height */
|
||||
background: #000000; /* Green background */
|
||||
cursor: pointer; /* Cursor on hover */
|
||||
}
|
||||
|
||||
code {
|
||||
background-color: lightgray;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
footer {
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
height: 25px;
|
||||
background-color: lightgray;
|
||||
|
||||
display: flex;
|
||||
}
|
||||
|
||||
footer .container {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
position: relative;
|
||||
vertical-align: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
$separator_thickness: 4px;
|
||||
.app {
|
||||
.container-app-main {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
|
||||
border: $separator_thickness solid lightgray;
|
||||
border-top-width: 0;
|
||||
}
|
||||
|
||||
.container-control-bar {
|
||||
height: 45px;
|
||||
width: 100%;
|
||||
border-radius: 2px 0 0 0;
|
||||
border-bottom-width: 0;
|
||||
background-color: lightgrey;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.container-channel-chat {
|
||||
min-width: 100px;
|
||||
width: 60%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-channel {
|
||||
background: white;
|
||||
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
height: calc(100% - 250px);
|
||||
min-height: 100px;
|
||||
|
||||
/*
|
||||
overflow: auto;
|
||||
overflow-x: visible;
|
||||
*/
|
||||
overflow: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.container-chat {
|
||||
background: white;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
//max-height: 400px;
|
||||
height: 250px;
|
||||
min-height: 100px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-info {
|
||||
background: white;
|
||||
|
||||
min-width: 100px;
|
||||
width: 40%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
}
|
||||
}
|
||||
|
||||
.container-seperator {
|
||||
background: lightgray;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
&.horizontal {
|
||||
height: $separator_thickness;
|
||||
width: 100%;
|
||||
|
||||
cursor: row-resize;
|
||||
}
|
||||
|
||||
&.vertical {
|
||||
width: $separator_thickness;
|
||||
height: 100%;
|
||||
|
||||
cursor: col-resize;
|
||||
}
|
||||
}
|
||||
|
||||
#mouse-move {
|
||||
display: none;
|
||||
position: absolute;
|
||||
z-index: 10000;
|
||||
|
||||
.container {
|
||||
position: relative;
|
||||
display: block;
|
||||
|
||||
border: 2px solid gray;
|
||||
-webkit-border-radius: 2px;
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
html, body {
|
||||
min-height: 500px;
|
||||
min-width: 500px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.icon-playlist-manage {
|
||||
display: inline-block;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
|
||||
background: url('../img/music/playlist.svg') no-repeat;
|
||||
background-position: -11px -9px;
|
||||
background-size: 50px;
|
||||
}
|
||||
|
||||
x-content {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
.bancreate {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.frame-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.container {
|
||||
display: block;
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
|
||||
input, textarea {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
textarea {
|
||||
resize: vertical;
|
||||
max-height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
&:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
&.container-reason {
|
||||
max-height: 500px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.container-name-type {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top: 2px;
|
||||
|
||||
* {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.container-time-input {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
.container-global {
|
||||
display: inline-block;
|
||||
|
||||
.input-global {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
}
|
||||
.container-buttons {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
.banlist {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
flex-grow: 1;
|
||||
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
.frame-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
flex-grow: 1;
|
||||
|
||||
.top-menu {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.manage-buttons {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.search {
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.entry-container {
|
||||
display: inline-flex;
|
||||
flex-grow: 1;
|
||||
margin-bottom: 5px;
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
.table-container {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.ban-entry.selected {
|
||||
background: blue;
|
||||
}
|
||||
|
||||
.ban-entry-global {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.ban-entry {
|
||||
.field-properties {
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
.field-reason {
|
||||
word-wrap: break-word;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
&.ban-entry-own-bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
table {
|
||||
border: grey solid 1px;
|
||||
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
text-align: left;
|
||||
min-width: 610px;
|
||||
|
||||
tr {
|
||||
td, th {
|
||||
text-align: center;
|
||||
vertical-align: top;
|
||||
|
||||
&:nth-child(1) {
|
||||
width: 25%;
|
||||
text-align: left;
|
||||
}
|
||||
&:nth-child(2) {
|
||||
width: 25%;
|
||||
float: left;
|
||||
}
|
||||
&:nth-child(3) {
|
||||
width: 25%;
|
||||
float: left;
|
||||
}
|
||||
&:nth-child(4) {
|
||||
width: 25%;
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
th {
|
||||
border: grey solid;
|
||||
border-width: 0 0 1px 1px;
|
||||
|
||||
&:first-of-type {
|
||||
border-width: 0 0 1px 0;
|
||||
}
|
||||
}
|
||||
|
||||
tbody {
|
||||
height: calc(100% - 22px);
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
th, td, thead,tbody {
|
||||
display: block;
|
||||
}
|
||||
tr {
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
|
||||
&:nth-of-type(even) {
|
||||
background-color: lightgray;
|
||||
}
|
||||
}
|
||||
td,th {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-menu {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
div {
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
input {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
.modal .modal-connect {
|
||||
margin-top: 5px;
|
||||
|
||||
> div:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.profile-select-container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
select {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
.profile-invalid {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
|
||||
> div {
|
||||
display: inline-flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,460 +0,0 @@
|
|||
|
||||
.playlist-management {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.header, .footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.buttons {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-left: 5px;
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list {
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
$width_id: 80px;
|
||||
$width_type: 150px;
|
||||
$width_used: 40px;
|
||||
.column {
|
||||
&.column-id {
|
||||
width: 80px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-title {
|
||||
width: calc(50% - 95px - 40px);
|
||||
}
|
||||
|
||||
&.column-creator {
|
||||
width: calc(50% - 95px - 40px);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-type {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-used {
|
||||
width: 40px;
|
||||
flex-grow: 0;
|
||||
text-align: center;
|
||||
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
height: 20px;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
&.highlighted {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
.column-title {
|
||||
width: calc(50% - 95px - 40px + 30px)
|
||||
}
|
||||
|
||||
.column-creator {
|
||||
width: calc(50% - 95px - 40px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
.buttons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.highlight-own {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-right: 10px;
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-edit {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
/* justify-content: stretch; */
|
||||
|
||||
.tab-content {
|
||||
padding: 0; /* override tab-content setting */
|
||||
}
|
||||
|
||||
.general-properties, .playback-properties {
|
||||
padding: 5px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
||||
flex-direction: column;
|
||||
|
||||
.property {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.checkbox-container {
|
||||
input {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.property-description {
|
||||
textarea {
|
||||
resize: vertical;
|
||||
max-height: 400px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.playback-properties {
|
||||
.property .key {
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-permissions {
|
||||
padding: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
|
||||
.permissions-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.permission {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-no-permissions {
|
||||
background: lightgray;
|
||||
padding: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.tab-content, x-content {
|
||||
overflow-y: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.container-songs {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 5px;
|
||||
|
||||
.song-list {
|
||||
min-height: 300px;
|
||||
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
&.column-id {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
&.column-url {
|
||||
width: calc(100% - 140px)
|
||||
}
|
||||
|
||||
&.column-loaded {
|
||||
width: 50px;
|
||||
flex-grow: 0;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
&.column-buttons {
|
||||
width: 40px;
|
||||
flex-grow: 0;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: row;
|
||||
|
||||
.button {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
&:hover {
|
||||
background: #00000033;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.song-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
height: 20px;
|
||||
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.song-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
&.playing {
|
||||
background-color: lightgreen;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
&.column-url {
|
||||
width: calc(100% - 140px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
> .buttons {
|
||||
margin-top: 5px;
|
||||
align-self: flex-end;
|
||||
|
||||
button {
|
||||
width: 100px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-song-info {
|
||||
display: flex;
|
||||
flex-shrink: 1;
|
||||
flex-direction: column;
|
||||
|
||||
.properties {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-bottom: 5px;
|
||||
|
||||
.property {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
&.property-metadata-raw {
|
||||
flex-direction: column;
|
||||
flex-shrink: 1;
|
||||
margin-top: 5px;
|
||||
|
||||
.line {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
textarea {
|
||||
margin-top: 5px;
|
||||
|
||||
width: 100%;
|
||||
max-height: 100%;
|
||||
resize: vertical;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-song-add {
|
||||
display: flex;
|
||||
flex-shrink: 1;
|
||||
flex-direction: column;
|
||||
|
||||
.properties {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-bottom: 5px;
|
||||
|
||||
.property {
|
||||
margin-bottom: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,173 +0,0 @@
|
|||
.query-create {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.row-name {
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
input {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.buttons {
|
||||
margin-top: 5px;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.query-created {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.property-row {
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
align-items: center;
|
||||
|
||||
margin-top: 2px;
|
||||
|
||||
input {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
a:first-of-type {
|
||||
width: 150px;
|
||||
}
|
||||
|
||||
div:last-of-type {
|
||||
margin-left: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.buttons {
|
||||
margin-top: 5px;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.query-management {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.header, .footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.buttons {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-left: 5px;
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.query-list {
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
&.column-username {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-unique-id {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-bound-server {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
height: 20px;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
.column-username {
|
||||
width: calc(50% - 75px + 30px)
|
||||
}
|
||||
|
||||
.column-unique-id {
|
||||
width: calc(50% - 75px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
}
|
||||
}
|
||||
}
|
||||
239
shared/css/static/channel-tree.scss
Normal file
239
shared/css/static/channel-tree.scss
Normal file
|
|
@ -0,0 +1,239 @@
|
|||
/* the channel tree */
|
||||
.channel-tree {
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
width: 100%;
|
||||
|
||||
display: -ms-flex;
|
||||
display: flex;
|
||||
|
||||
flex-direction: column;
|
||||
|
||||
* {
|
||||
font-family: sans-serif;
|
||||
font-size: 12px;
|
||||
white-space: pre;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.tree-entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
/* margin-left: 16px; */
|
||||
min-height: 16px;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
&.server {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-left: 0;
|
||||
|
||||
.server_type {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.name {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
.icon_property {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
}
|
||||
|
||||
&.channel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.container-channel {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
width: 100%;
|
||||
min-height: 16px;
|
||||
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
.channel-type {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.container-channel-name {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
justify-content: left;
|
||||
|
||||
max-width: 100%; /* important for the repetitive channel name! */
|
||||
overflow-x: hidden;
|
||||
height: 16px;
|
||||
|
||||
&.align-right {
|
||||
justify-content: right;
|
||||
}
|
||||
|
||||
&.align-center, &.align-repetitive {
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.channel-name {
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
|
||||
.icons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&.move-selected {
|
||||
border-bottom: 1px solid black;
|
||||
}
|
||||
|
||||
.show-channel-normal-only {
|
||||
display: none;
|
||||
|
||||
&.channel-normal {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-clients {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
&.client {
|
||||
cursor: pointer;
|
||||
|
||||
position: relative;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
align-items: center;
|
||||
|
||||
> div {
|
||||
margin-right: 2px;
|
||||
}
|
||||
|
||||
.client-name {
|
||||
&.client-name-own {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.container-icons {
|
||||
margin-right: 0; /* override from previous thing */
|
||||
|
||||
position: absolute;
|
||||
right: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
align-items: center;
|
||||
|
||||
.container-icons-group {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.container-group-icon {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* all icons related to basic_icons */
|
||||
.clicon {width:16px;height:16px;background:url('../../img/ts/basic_icons.png') no-repeat;background-size: 16px 608px;}
|
||||
|
||||
.host {background-position: 0 -448px}
|
||||
|
||||
.server_open {background-position: 0 -352px}
|
||||
.server_full {background-position: 0 -128px}
|
||||
.server_pass {background-position: 0 -432px}
|
||||
|
||||
/* Server group icon */
|
||||
.group_0 {background-position: 0 -464px}
|
||||
.group_100 {background-position: 0 -16px}
|
||||
.group_200 {background-position: 0 -304px}
|
||||
.group_300 {background-position: 0 -80px}
|
||||
.group_400 {background-position: 0 -528px}
|
||||
.group_500 {background-position: 0 -416px}
|
||||
.group_600 {background-position: 0 -272px}
|
||||
|
||||
.group_server{background-position: 0 -496px}
|
||||
.group_channel {background-position: 0 -400px}
|
||||
|
||||
/* Channel icons */
|
||||
.channel_open {background-position: 0 -64px}
|
||||
.channel_pass {background-position: 0 -112px}
|
||||
.channel_full {background-position: 0 -256px}
|
||||
.channel_flag_music {background-position: 0 -32px}
|
||||
.channel_flag_default {background-position: 0 -48px}
|
||||
.channel_flag_moderated {background-position: 0 -192px}
|
||||
.channel_flag_password {background-position: 0 -480px}
|
||||
|
||||
/* Client icons */
|
||||
.client_mic_muted {background-position: 0 -96px}
|
||||
.client_talker {background-position: 0 -144px}
|
||||
.client_idle {background-position: 0 -160px}
|
||||
.client_talk {background-position: 0 -208px}
|
||||
.client_snd_muted {background-position: 0 -176px}
|
||||
.client_query {background-position: 0 -224px}
|
||||
.client_talker_request {background-position: 0 -240px}
|
||||
.client_snd_disabled {background-position: 0 -320px}
|
||||
.client_priority {background-position: 0 -336px}
|
||||
.client_away {background-position: 0 -368px}
|
||||
.client_cc {background-position: 0 -384px}
|
||||
.client_cc_talk {background-position: 0 -544px}
|
||||
.client_cc_idle {background-position: 0 -288px}
|
||||
.client_mic_disabled {background-position: 0 -512px}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
.context-menu {
|
||||
overflow: visible;
|
||||
display: none;
|
||||
z-index: 1000;
|
||||
z-index: 2000;
|
||||
position: absolute;
|
||||
border: 1px solid #CCC;
|
||||
white-space: nowrap;
|
||||
|
|
@ -18,6 +18,11 @@
|
|||
vertical-align: middle;
|
||||
}
|
||||
|
||||
hr {
|
||||
margin-top: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.entry {
|
||||
/*padding: 8px 12px;*/
|
||||
padding-right: 12px;
|
||||
|
|
@ -6,6 +6,10 @@ $background:lightgray;
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
/* tmp fix for ultra small devices */
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
|
||||
.divider {
|
||||
border-left:2px solid gray;
|
||||
height: auto;
|
||||
|
|
@ -132,6 +136,12 @@ $background:lightgray;
|
|||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
hr {
|
||||
margin-top: 5px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.bookmark-dropdown {
|
||||
|
|
@ -94,4 +94,15 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.client-avatar {
|
||||
> div {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
> img {
|
||||
max-width: 100%;
|
||||
max-height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
387
shared/css/static/general.scss
Normal file
387
shared/css/static/general.scss
Normal file
|
|
@ -0,0 +1,387 @@
|
|||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.align_row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.align_column {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.icon_loading {
|
||||
border: 2px solid #f3f3f3; /* Light grey */
|
||||
border-top: 2px solid #3498db; /* Blue */
|
||||
border-radius: 50%;
|
||||
animation: spin 2s linear infinite;
|
||||
|
||||
width: 14px !important;
|
||||
height: 14px !important;
|
||||
}
|
||||
|
||||
.avatar_loading {
|
||||
border: 2px solid #f3f3f3; /* Light grey */
|
||||
border-top: 2px solid #3498db; /* Blue */
|
||||
border-radius: 50%;
|
||||
animation: spin 2s linear infinite;
|
||||
|
||||
width: 14px !important;
|
||||
height: 14px !important;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
0% {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
100% {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
.select_info {
|
||||
font-family: Arial;
|
||||
font-size: 12px;
|
||||
/*white-space: pre;*/
|
||||
line-height: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
/* The Modal (background) */
|
||||
.modal_disabled {
|
||||
display: none; /* Hidden by default */
|
||||
position: fixed; /* Stay in place */
|
||||
z-index: 1; /* Sit on top */
|
||||
left: 0;
|
||||
top: 0;
|
||||
width: 100%; /* Full width */
|
||||
height: 100%; /* Full height */
|
||||
overflow: auto; /* Enable scroll if needed */
|
||||
background-color: rgb(0, 0, 0); /* Fallback color */
|
||||
background-color: rgba(0, 0, 0, 0.4); /* Black w/ opacity */
|
||||
|
||||
/* Modal Header */
|
||||
.modal-header {
|
||||
padding: 2px 16px;
|
||||
min-height: 30px;
|
||||
vertical-align: middle;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
border: grey solid;
|
||||
border-width: 0 0 1px 0;
|
||||
|
||||
background-color: lightgreen;
|
||||
}
|
||||
|
||||
/* Modal Body */
|
||||
.modal-body:not(:empty) {
|
||||
display: flex;
|
||||
padding: 2px 16px;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
}
|
||||
|
||||
/* Modal Footer */
|
||||
.modal-footer:not(:empty) {
|
||||
padding: 2px 16px;
|
||||
}
|
||||
|
||||
/* The Close Button */
|
||||
.close {
|
||||
color: #aaa;
|
||||
float: right;
|
||||
font-size: 28px;
|
||||
font-weight: bold;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 4px;
|
||||
}
|
||||
|
||||
.close:hover,
|
||||
.close:focus {
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Modal Content */
|
||||
.modal-content:not(:empty) {
|
||||
position: absolute;
|
||||
display: inline-flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
background-color: #fefefe;
|
||||
margin: auto;
|
||||
padding: 0;
|
||||
border: 2px solid #888;
|
||||
width: auto;
|
||||
max-width: 90%;
|
||||
box-shadow: 0 4px 15px 0 rgba(0, 0, 0, 0.2), 2px 6px 20px 0 rgba(0, 0, 0, 0.19);
|
||||
animation-name: modalFlyIn;
|
||||
animation-duration: 0.4s;
|
||||
top: 10%;
|
||||
max-height: 80%;
|
||||
|
||||
left: 0;
|
||||
right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Add Animation */
|
||||
@keyframes modalFlyIn {
|
||||
from {
|
||||
top: 0%;
|
||||
opacity: 0
|
||||
}
|
||||
to {
|
||||
top: 10%;
|
||||
opacity: 1
|
||||
}
|
||||
}
|
||||
|
||||
.channel_perm_tbl input {
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
.channel_perm_tbl .key {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
.channel_general_properties .value {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
html {
|
||||
background-color: gray;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
border: unset;
|
||||
display: unset;
|
||||
}
|
||||
|
||||
.modal-head-error {
|
||||
background: darkred;
|
||||
|
||||
font-family: Arial;
|
||||
font-size: 15px;
|
||||
font-weight: bold;
|
||||
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.modal-button-group {
|
||||
|
||||
}
|
||||
|
||||
.modal-button-group button {
|
||||
width: 100px;
|
||||
margin-right: 5px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.modal-button-group button:last-of-type {
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
.invalid_input {
|
||||
border-color: red;
|
||||
}
|
||||
|
||||
.GroupBox {
|
||||
border: gray solid;
|
||||
border-width: 2px;
|
||||
border-radius: 0px 6px 6px 6px;
|
||||
}
|
||||
|
||||
code {
|
||||
background-color: lightgray;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
footer {
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
height: 25px;
|
||||
background-color: lightgray;
|
||||
|
||||
display: flex;
|
||||
}
|
||||
|
||||
footer .container {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
position: relative;
|
||||
vertical-align: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
$separator_thickness: 4px;
|
||||
.app {
|
||||
.container-app-main {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
|
||||
border: $separator_thickness solid lightgray;
|
||||
border-top-width: 0;
|
||||
}
|
||||
|
||||
.container-control-bar {
|
||||
height: 45px;
|
||||
width: 100%;
|
||||
border-radius: 2px 0 0 0;
|
||||
border-bottom-width: 0;
|
||||
background-color: lightgrey;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.container-channel-chat {
|
||||
min-width: 100px;
|
||||
width: 60%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-channel-tree {
|
||||
background: white;
|
||||
|
||||
display: flex;
|
||||
justify-content: stretch;
|
||||
height: calc(100% - 250px);
|
||||
min-height: 100px;
|
||||
|
||||
/*
|
||||
overflow: auto;
|
||||
overflow-x: visible;
|
||||
*/
|
||||
overflow: hidden;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.container-chat {
|
||||
background: white;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
//max-height: 400px;
|
||||
height: 250px;
|
||||
min-height: 100px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-info {
|
||||
background: white;
|
||||
|
||||
min-width: 100px;
|
||||
width: 40%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
}
|
||||
}
|
||||
|
||||
.container-seperator {
|
||||
background: lightgray;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
&.horizontal {
|
||||
height: $separator_thickness;
|
||||
width: 100%;
|
||||
|
||||
cursor: row-resize;
|
||||
}
|
||||
|
||||
&.vertical {
|
||||
width: $separator_thickness;
|
||||
height: 100%;
|
||||
|
||||
cursor: col-resize;
|
||||
}
|
||||
|
||||
&.seperator-selected {
|
||||
background-color: #00000011;
|
||||
}
|
||||
}
|
||||
|
||||
.icon-container {
|
||||
display: inline-block;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
|
||||
> img {
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
#mouse-move {
|
||||
display: none;
|
||||
position: absolute;
|
||||
z-index: 10000;
|
||||
|
||||
.container {
|
||||
position: relative;
|
||||
display: block;
|
||||
|
||||
border: 2px solid gray;
|
||||
-webkit-border-radius: 2px;
|
||||
-moz-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
html, body {
|
||||
min-height: 500px;
|
||||
min-width: 500px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
body {
|
||||
padding: 8px;
|
||||
background: darkgray !important;
|
||||
}
|
||||
|
||||
.icon-playlist-manage {
|
||||
display: inline-block;
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
|
||||
background: url('../../img/music/playlist.svg') no-repeat;
|
||||
background-position: -11px -9px;
|
||||
background-size: 50px;
|
||||
}
|
||||
|
||||
x-content {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
[class*=" bmd-label"], [class^=bmd-label] {
|
||||
color: rgba(0, 0, 0, .6) !important;
|
||||
}
|
||||
62
shared/css/static/modal-bancreate.scss
Normal file
62
shared/css/static/modal-bancreate.scss
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
.bancreate {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.frame-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
select.form-control {
|
||||
height: 2rem!important;
|
||||
}
|
||||
|
||||
.form-row {
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
div:first-of-type {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
div:nth-of-type(2) {
|
||||
min-width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
.form-group, .form-row {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
&.container-reason {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
.container-global {
|
||||
display: inline-block;
|
||||
|
||||
.input-global {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
}
|
||||
.container-buttons {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
180
shared/css/static/modal-banlist.scss
Normal file
180
shared/css/static/modal-banlist.scss
Normal file
|
|
@ -0,0 +1,180 @@
|
|||
.banlist {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
flex-grow: 1;
|
||||
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
.frame-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
flex-grow: 1;
|
||||
|
||||
.top-menu {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.manage-buttons {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.search {
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.entry-container {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
margin-bottom: 5px;
|
||||
position: relative;
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
.entries {
|
||||
width: 100%;
|
||||
min-height: 300px;
|
||||
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.ban-entry {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
&.header {
|
||||
.column {
|
||||
font-weight: bold;
|
||||
|
||||
&.column-time {
|
||||
margin-right: 0!important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:not(.header) {
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
background-color: #00000011;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background: blue;
|
||||
|
||||
&:hover {
|
||||
background-color: #0000FFAA;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.column {
|
||||
flex-grow: 1;
|
||||
|
||||
&.column-keys {
|
||||
width: 25%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
&.column-reason {
|
||||
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
&.column-creator {
|
||||
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
&.column-time {
|
||||
width: 25%;
|
||||
min-width: 230px;
|
||||
max-width: 300px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
margin-right: -15px; /* because of the scroll bar */
|
||||
|
||||
> div {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
a {
|
||||
display: inline;
|
||||
width: 100px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.ban-entry-global {
|
||||
color: red;
|
||||
}
|
||||
|
||||
&.ban-entry-own-bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-menu {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.left {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
div {
|
||||
margin-left: 2px;
|
||||
margin-right: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
input {
|
||||
vertical-align: bottom;
|
||||
}
|
||||
|
||||
.bmd-form-group {
|
||||
padding-top: 0;
|
||||
align-self: center;
|
||||
|
||||
margin-left: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -105,6 +105,17 @@
|
|||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.container-default-channel-select {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-default-channel {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
171
shared/css/static/modal-channel.scss
Normal file
171
shared/css/static/modal-channel.scss
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
.container-channel-settings-standard {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-divider {
|
||||
border-left:1px solid #000;
|
||||
height: auto;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.container-left, .container-right {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-self: center;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.container-right {
|
||||
flex-direction: column;
|
||||
align-content: stretch;
|
||||
vertical-align: center;
|
||||
|
||||
margin: 20px 50px 20px 50px;
|
||||
}
|
||||
|
||||
.container-channel-type {
|
||||
padding: 5px;
|
||||
|
||||
border: lightgrey 2px solid;
|
||||
border-radius: 2px;
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
.container-channel-settings-audio {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-divider {
|
||||
border-left:1px solid #000;
|
||||
height: auto;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.container-presets, .container-custom {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
text-align: left;
|
||||
align-self: center;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
.container-custom {
|
||||
margin: 20px 50px 20px 50px;
|
||||
justify-content: stretch;
|
||||
|
||||
> .group_box {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-channel-settings-permission {
|
||||
flex-grow: 1;
|
||||
|
||||
display: flex;
|
||||
justify-content: space-evenly;
|
||||
|
||||
align-items: center;
|
||||
|
||||
|
||||
.container-left, .container-right {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-self: center;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: 50%;
|
||||
|
||||
> .group_box {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.form-placeholder {
|
||||
display: block;
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.container-left {
|
||||
margin-left: 10%;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.container-right {
|
||||
margin-right: 10%;
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-channel-settings-advanced {
|
||||
flex-grow: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
.container-max-users, .container-other {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.container-max-users {
|
||||
margin-top: 20px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.group_box:not(:first-of-type) {
|
||||
margin-left: 40px;
|
||||
}
|
||||
|
||||
> .group_box {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
padding-top: 1rem;
|
||||
}
|
||||
|
||||
.form-row {
|
||||
margin-left: 20px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.bmd-form-group {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
label {
|
||||
width: 100px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
73
shared/css/static/modal-connect.scss
Normal file
73
shared/css/static/modal-connect.scss
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
.modal .modal-connect {
|
||||
|
||||
/*
|
||||
margin-top: 5px;
|
||||
|
||||
> div:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.profile-select-container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
select {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
|
||||
.profile-invalid {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
|
||||
> div {
|
||||
display: inline-flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
color: red;
|
||||
}
|
||||
*/
|
||||
|
||||
.container-address-password {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-address {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.container-password {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-left: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-profile-manage {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-select-profile {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.container-manage {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
margin-left: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
.invalid-feedback {
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
302
shared/css/static/modal-permissions.scss
Normal file
302
shared/css/static/modal-permissions.scss
Normal file
|
|
@ -0,0 +1,302 @@
|
|||
permission-editor {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
|
||||
.container-permissions {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.permission-explorer {
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
user-select: none;
|
||||
|
||||
.container-filter, .container-footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-input {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-permission-list {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.header {
|
||||
border: solid 1px lightgray;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column-granted {
|
||||
width: 75px + 15px !important; /* because of the scroll bar */
|
||||
}
|
||||
|
||||
.column-name {
|
||||
padding-left: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.entries {
|
||||
flex-grow: 1;
|
||||
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
|
||||
padding-left: 3px; /* because of the arrow */
|
||||
padding-right: 3px; /* because of the scroll bar */
|
||||
}
|
||||
|
||||
.entry {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.column-name {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
|
||||
.column-value, .column-granted {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
width: 75px;
|
||||
text-align: center;
|
||||
align-self: center;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
|
||||
input[type=number] {
|
||||
width: 68px;
|
||||
}
|
||||
}
|
||||
|
||||
.column-skip, .column-negate {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
width: 75px;
|
||||
|
||||
text-align: center;
|
||||
align-self: center;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
}
|
||||
|
||||
&.value-unset {
|
||||
.column-value, .column-skip, .column-negate {
|
||||
.checkbox, input {
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.grant-unset {
|
||||
.column-granted {
|
||||
.checkbox, input {
|
||||
visibility: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.checkbox {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
margin-bottom: 0!important;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
&.group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.group-entries {
|
||||
padding-left: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.bmd-form-group {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
&.permission {
|
||||
height: 33px;
|
||||
|
||||
&:hover {
|
||||
background: #00000011;
|
||||
|
||||
|
||||
.checkbox {
|
||||
.checkmark {
|
||||
background-color: #bbb;
|
||||
}
|
||||
|
||||
&:hover input ~ .checkmark {
|
||||
background-color: #aaa;
|
||||
}
|
||||
|
||||
input:checked ~ .checkmark {
|
||||
background-color: #2196F3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.checkbox {
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
|
||||
display: block;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
font-size: 22px;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
/* Hide the browser's default checkbox */
|
||||
input {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
cursor: pointer;
|
||||
|
||||
left: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.checkmark {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
background-color: #eee;
|
||||
|
||||
&:after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
display: none;
|
||||
|
||||
left: 6px;
|
||||
top: 2px;
|
||||
width: 5px;
|
||||
height: 10px;
|
||||
border: solid white;
|
||||
border-width: 0 3px 3px 0;
|
||||
-webkit-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
}
|
||||
|
||||
&:hover input ~ .checkmark {
|
||||
background-color: #ccc;
|
||||
}
|
||||
|
||||
input:checked ~ .checkmark {
|
||||
background-color: #2196F3;
|
||||
}
|
||||
|
||||
input:checked ~ .checkmark:after {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.arrow {
|
||||
cursor: pointer;
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-footer {
|
||||
margin-top: 10px;
|
||||
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.container-mode {
|
||||
display: flex;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
&.container-mode-unset {
|
||||
background-color: lightgray;
|
||||
}
|
||||
|
||||
&.container-mode-no-permissions {
|
||||
background-color: lightgray;
|
||||
text-align: center;
|
||||
|
||||
justify-content: space-around;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tab-client, .tab-client-channel {
|
||||
.client-select {
|
||||
padding-bottom: 20px; /* for the error message */
|
||||
|
||||
.invalid-feedback {
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.tab-client-channel {
|
||||
.container-client-channel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.list-channel {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
438
shared/css/static/modal-playlist.scss
Normal file
438
shared/css/static/modal-playlist.scss
Normal file
|
|
@ -0,0 +1,438 @@
|
|||
|
||||
.playlist-management {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.header, .footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.buttons {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-left: 5px;
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list {
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
$width_id: 80px;
|
||||
$width_type: 150px;
|
||||
$width_used: 40px;
|
||||
.column {
|
||||
&.column-id {
|
||||
width: 80px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-title {
|
||||
width: calc(50% - 95px - 40px);
|
||||
}
|
||||
|
||||
&.column-creator {
|
||||
width: calc(50% - 95px - 40px);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-type {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&.column-used {
|
||||
width: 40px;
|
||||
flex-grow: 0;
|
||||
text-align: center;
|
||||
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
&.highlighted {
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
.column-title {
|
||||
width: calc(50% - 95px - 40px + 30px)
|
||||
}
|
||||
|
||||
.column-creator {
|
||||
width: calc(50% - 95px - 40px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
.info {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
.buttons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.highlight-own {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-right: 10px;
|
||||
align-self: center;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.playlist-edit {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.tab-content {
|
||||
padding: 0; /* override tab-content setting */
|
||||
}
|
||||
|
||||
.general-properties, .playback-properties {
|
||||
padding: 5px;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
||||
flex-direction: column;
|
||||
|
||||
.property {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-bottom: 5px;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.checkbox-container {
|
||||
input {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.property-description {
|
||||
textarea {
|
||||
resize: vertical;
|
||||
max-height: 400px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.playback-properties {
|
||||
.property .key {
|
||||
width: 175px;
|
||||
}
|
||||
}
|
||||
|
||||
.container-permissions {
|
||||
padding: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-around;
|
||||
|
||||
.group_box {
|
||||
min-width: 30%;
|
||||
}
|
||||
|
||||
.permissions-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
.container-no-permissions {
|
||||
background: lightgray;
|
||||
padding: 50px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.tab-content, x-content {
|
||||
overflow-y: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.container-songs {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 5px;
|
||||
|
||||
.song-list {
|
||||
min-height: 300px;
|
||||
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
&.column-id {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
&.column-url {
|
||||
width: calc(100% - 140px)
|
||||
}
|
||||
|
||||
&.column-loaded {
|
||||
width: 50px;
|
||||
flex-grow: 0;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
&.column-buttons {
|
||||
width: 40px;
|
||||
flex-grow: 0;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: row;
|
||||
|
||||
.button {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
&:hover {
|
||||
background: #00000033;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.song-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.song-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
|
||||
&.playing {
|
||||
background-color: lightgreen;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
&.column-url {
|
||||
width: calc(100% - 140px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
> .buttons {
|
||||
margin-top: 5px;
|
||||
align-self: flex-end;
|
||||
|
||||
button {
|
||||
width: 100px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-song-info {
|
||||
display: flex;
|
||||
flex-shrink: 1;
|
||||
flex-direction: column;
|
||||
|
||||
.properties {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-bottom: 5px;
|
||||
|
||||
.property {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
&.property-metadata-raw {
|
||||
flex-direction: column;
|
||||
flex-shrink: 1;
|
||||
margin-top: 5px;
|
||||
|
||||
.line {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
textarea {
|
||||
margin-top: 5px;
|
||||
|
||||
width: 100%;
|
||||
max-height: 100%;
|
||||
resize: vertical;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-song-add {
|
||||
display: flex;
|
||||
flex-shrink: 1;
|
||||
flex-direction: column;
|
||||
|
||||
.properties {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-bottom: 5px;
|
||||
|
||||
.property {
|
||||
margin-bottom: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
flex-shrink: 0;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
159
shared/css/static/modal-query.scss
Normal file
159
shared/css/static/modal-query.scss
Normal file
|
|
@ -0,0 +1,159 @@
|
|||
.query-create {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.row-name {
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
input {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.buttons {
|
||||
margin-top: 5px;
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.query-created {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.buttons {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.form-row {
|
||||
margin-right: 0!important;
|
||||
margin-left: 0!important;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.icon_x32 {
|
||||
align-self: center;
|
||||
margin-right: 5px;
|
||||
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.query-management {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.header, .footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.buttons {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-left: 5px;
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.query-list {
|
||||
margin-top: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
&.column-username {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-unique-id {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-bound-server {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-header {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-entries-container {
|
||||
flex-grow: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
.column-username {
|
||||
width: calc(50% - 75px + 30px)
|
||||
}
|
||||
|
||||
.column-unique-id {
|
||||
width: calc(50% - 75px + 30px)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
}
|
||||
}
|
||||
76
shared/css/static/modal-server.scss
Normal file
76
shared/css/static/modal-server.scss
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
.container-server-settings-general {
|
||||
.container-server-settings-slots {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
|
||||
.form-group:not(:first-of-type) {
|
||||
margin-left: 10px;
|
||||
|
||||
flex-grow: 30;
|
||||
flex-shrink: 30;
|
||||
}
|
||||
|
||||
.form-group:first-of-type {
|
||||
flex-grow: 70;
|
||||
flex-shrink: 70;
|
||||
}
|
||||
}
|
||||
}
|
||||
.container-server-settings-host {
|
||||
padding: 5px;
|
||||
|
||||
.properties-hostbanner, .properties-hostbutton {
|
||||
.form-row {
|
||||
margin-left: 5px;
|
||||
margin-right: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
> .form-group {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
> .form-group:not(:first-of-type) {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.virtualserver_hostbanner_gfx_interval {
|
||||
height: calc(2.4375rem + 2px);
|
||||
}
|
||||
}
|
||||
|
||||
.container-server-settings-file-transfer, .container-server-settings-anti-flood, .container-server-settings-security {
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.container-server-settings-misc {
|
||||
padding: 5px;
|
||||
|
||||
.container-complains {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
> div {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
> div:not(:first-of-type) {
|
||||
padding-left: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-server-settings-messages {
|
||||
padding: 5px;
|
||||
}
|
||||
|
|
@ -1,3 +1,6 @@
|
|||
$small_device: 800px; /* tested out via audio tab */
|
||||
|
||||
|
||||
.modal .settings_audio {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
|
@ -7,6 +10,7 @@
|
|||
user-select: none;
|
||||
|
||||
margin: 3px;
|
||||
|
||||
> div {
|
||||
margin: 2px;
|
||||
}
|
||||
|
|
@ -15,6 +19,10 @@
|
|||
align-self: center;
|
||||
}
|
||||
|
||||
.settings-device-error {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.group_box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
|
@ -24,7 +32,7 @@
|
|||
flex-shrink: 1;
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
display: block;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
|
@ -32,34 +40,19 @@
|
|||
|
||||
.settings-device {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
|
||||
a {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.settings-device-error {
|
||||
display: none;
|
||||
|
||||
width: 100%;
|
||||
margin-bottom: 3px;
|
||||
padding: 2px;
|
||||
|
||||
align-self: center;
|
||||
text-align: center;
|
||||
|
||||
vertical-align: center;
|
||||
border: darkred 2px solid;
|
||||
border-radius: 4px;
|
||||
background: #be00006b;
|
||||
}
|
||||
flex-direction: row;
|
||||
justify-items: stretch;
|
||||
|
||||
.settings-device-select {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-right: 5px;
|
||||
|
||||
> div {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
|
@ -75,11 +68,35 @@
|
|||
|
||||
.settings-vad-container {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
margin-top: 5px;
|
||||
min-height: 150px;
|
||||
flex-direction: column;
|
||||
width: 100%;
|
||||
|
||||
> div {
|
||||
width: 50%;
|
||||
width: 100%;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
/* for "normal" devices */
|
||||
@media (min-width: $small_device) {
|
||||
flex-direction: row;
|
||||
|
||||
> div {
|
||||
width: unset;
|
||||
}
|
||||
}
|
||||
|
||||
.group_box {
|
||||
min-width: 250px;
|
||||
}
|
||||
|
||||
.content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-around;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
|
|
@ -94,6 +111,12 @@
|
|||
}
|
||||
|
||||
.settings-vad-impl {
|
||||
.setting-vad-ppt {
|
||||
@media (min-width: $small_device) {
|
||||
margin-bottom: -35px;
|
||||
}
|
||||
}
|
||||
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
padding: 5px;
|
||||
|
|
@ -105,6 +128,74 @@
|
|||
.settings-vad-impl-entry {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.setting-vad-vad {
|
||||
.vad_vad_bar {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 20px;
|
||||
|
||||
background-image: linear-gradient(to right, green, yellow, red);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100%;
|
||||
background-position: 0 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.bmd-form-group {
|
||||
display: flex;
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.container-hider {
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row-reverse;
|
||||
|
||||
.hider {
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
|
||||
background-color: grey;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* The slider itself */
|
||||
.vad_vad_slider {
|
||||
margin: 0;
|
||||
background-color: gray;
|
||||
-webkit-appearance: none; /* Override default CSS styles */
|
||||
appearance: none;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
outline: none;
|
||||
opacity: 0.7; /* Set transparency (for mouse-over effects on hover) */
|
||||
-webkit-transition: .2s; /* 0.2 seconds transition on hover */
|
||||
transition: opacity .2s;
|
||||
}
|
||||
|
||||
/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */
|
||||
.vad_vad_slider::-webkit-slider-thumb {
|
||||
-webkit-appearance: none; /* Override default look */
|
||||
appearance: none;
|
||||
width: 2px; /* Set a specific slider handle width */
|
||||
height: 20px; /* Slider handle height */
|
||||
background: #000000FF; /* Green background */
|
||||
cursor: pointer; /* Cursor on hover */
|
||||
}
|
||||
|
||||
.vad_vad_slider::-moz-range-thumb {
|
||||
width: 2px; /* Set a specific slider handle width */
|
||||
height: 100%; /* Slider handle height */
|
||||
background: #000000FF; /* Green background */
|
||||
cursor: pointer; /* Cursor on hover */
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.property {
|
||||
|
|
@ -116,8 +207,19 @@
|
|||
margin-right: 5px;
|
||||
}
|
||||
|
||||
&.ppt-key {
|
||||
.key {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
button {
|
||||
min-width: 100px;
|
||||
}
|
||||
}
|
||||
|
||||
&.ppt-delay {
|
||||
margin-top: 5px;
|
||||
|
||||
.value {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
|
|
@ -156,11 +258,14 @@
|
|||
justify-content: stretch;
|
||||
|
||||
.key {
|
||||
width: 150px;
|
||||
/*
|
||||
width: 250px;
|
||||
|
||||
&.muted-sounds {
|
||||
width: 230px;
|
||||
}
|
||||
*/
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.value {
|
||||
|
|
@ -182,6 +287,19 @@
|
|||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.bmd-form-group {
|
||||
padding: 0;
|
||||
|
||||
label {
|
||||
margin: 0;
|
||||
top: -7px;
|
||||
}
|
||||
|
||||
.bmd-switch-track {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -202,8 +320,17 @@
|
|||
width: 150px;
|
||||
flex-grow: 0;
|
||||
|
||||
input {
|
||||
margin-left: 75px;
|
||||
.bmd-form-group {
|
||||
padding: 0;
|
||||
|
||||
label {
|
||||
margin: 0 0 0 75px;
|
||||
top: -7px;
|
||||
}
|
||||
|
||||
.bmd-switch-track {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -213,7 +340,7 @@
|
|||
flex-shrink: 0;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
height: 20px;
|
||||
align-items: center;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
|
|
@ -264,6 +391,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
.sound-list-filter {
|
||||
margin-top: 3px;
|
||||
|
||||
|
|
@ -280,11 +408,13 @@
|
|||
margin-right: 8px;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
.modal .settings-translations {
|
||||
margin: 5px;
|
||||
|
||||
.setting-list {
|
||||
user-select: none;
|
||||
|
||||
|
|
@ -311,7 +441,8 @@
|
|||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.default { }
|
||||
.default {
|
||||
}
|
||||
|
||||
.name {
|
||||
flex-grow: 1;
|
||||
|
|
@ -423,6 +554,7 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.contributor {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -508,6 +640,7 @@
|
|||
|
||||
.modal .settings-profiles {
|
||||
margin: 5px;
|
||||
|
||||
> div:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
|
@ -620,10 +753,6 @@
|
|||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.select-container {
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -643,6 +772,26 @@
|
|||
}
|
||||
|
||||
&.identity-settings-teamspeak {
|
||||
.level {
|
||||
padding-right: 5px;
|
||||
padding-left: 5px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-input {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.property {
|
||||
&:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
|
|
@ -664,18 +813,6 @@
|
|||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&.level {
|
||||
.value {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
button {
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.identity-undefined {
|
||||
|
|
@ -739,45 +876,15 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.property {
|
||||
&:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.bmd-label-static {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.key {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
width: 120px;
|
||||
|
||||
.help-tagged {
|
||||
width: 80px;
|
||||
}
|
||||
}
|
||||
|
||||
.value {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 2;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
.form-row {
|
||||
margin-right: 0!important;
|
||||
margin-left: 0!important;
|
||||
justify-content: space-between;
|
||||
|
||||
.property {
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.buttons {
|
||||
|
|
@ -787,7 +894,7 @@
|
|||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
button {
|
||||
button {
|
||||
width: 100px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,21 @@
|
|||
body {
|
||||
padding-right: 8px!important; /* remove the fucking bootstrap override */
|
||||
}
|
||||
|
||||
/* backdrop fix */
|
||||
.modal-backdrop {
|
||||
visibility: hidden !important;
|
||||
}
|
||||
.modal {
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
padding-right: 8% !important;
|
||||
}
|
||||
|
||||
modal-body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.modal {
|
||||
//General style
|
||||
.properties {
|
||||
|
|
@ -13,42 +31,12 @@
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
.general_properties, .properties_general, .server_properties, .properties_messages {
|
||||
width: 100%;
|
||||
|
||||
.group_box {
|
||||
margin-top: 5px;
|
||||
|
||||
&:first-of-type {
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.input_error {
|
||||
border-radius: 1px;
|
||||
border: solid red;
|
||||
}
|
||||
|
||||
.server_properties {
|
||||
.properties {
|
||||
grid-template-columns: 135px auto;
|
||||
&:first-of-type {
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.virtualserver_welcomemessage {
|
||||
height: 70px;
|
||||
resize: none;
|
||||
}
|
||||
}
|
||||
|
||||
.properties_messages textarea {
|
||||
height: 70px;
|
||||
resize: none;
|
||||
}
|
||||
|
||||
.properties_misc {
|
||||
.complains {
|
||||
display: grid;
|
||||
|
|
@ -62,34 +50,78 @@
|
|||
.container {
|
||||
padding: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
.modal-dialog {
|
||||
max-height: 80%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.container-file-transfer {
|
||||
.settings {
|
||||
.setting {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
&.modal-dialog-centered {
|
||||
justify-content: stretch;
|
||||
}
|
||||
}
|
||||
|
||||
&:not(:first-of-type) {
|
||||
margin-top: 5px;
|
||||
.modal-content {
|
||||
/* max-height: 500px; */
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.modal-header {
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
&.modal-header-error {
|
||||
background-color: #ce0000;
|
||||
}
|
||||
|
||||
div {
|
||||
flex-grow: 0;
|
||||
|
||||
&.suffix {
|
||||
width: 50px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
&:first-of-type {
|
||||
width: 130px;
|
||||
}
|
||||
&.modal-header-info {
|
||||
background-color: #03a9f4;
|
||||
}
|
||||
|
||||
input {
|
||||
flex-grow: 1;
|
||||
&.modal-header-warning, &.modal-header-info, &.modal-header-error {
|
||||
border-top-left-radius: .125rem;
|
||||
border-top-right-radius: .125rem;
|
||||
}
|
||||
}
|
||||
|
||||
.modal-body {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
input.is-invalid {
|
||||
background-image: linear-gradient(0deg, #d50000 2px, rgba(213, 0, 0, 0) 0), linear-gradient(0deg, rgba(241, 1, 1, 0.61) 1px, transparent 0);
|
||||
}
|
||||
|
||||
&.modal-body-input {
|
||||
.form-group:not(.with-title) {
|
||||
padding-top: .75rem;
|
||||
}
|
||||
|
||||
input.is-invalid ~ .container-help-feedback > .invalid-feedback {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.container-help-feedback {
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.modal-footer {
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
&.modal-footer-button-group {
|
||||
button {
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
button:not(:first-of-type) {
|
||||
margin-left: 15px;
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -178,197 +210,6 @@
|
|||
flex-direction: column;
|
||||
}
|
||||
|
||||
.container-permissions {
|
||||
display: flex;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.permission-explorer {
|
||||
width: 100%;
|
||||
display: grid;
|
||||
grid-template-rows: min-content auto min-content;
|
||||
grid-gap: 5px;
|
||||
|
||||
.bar-filter {
|
||||
display: grid;
|
||||
grid-gap: 5px;
|
||||
grid-template-columns: max-content auto max-content;
|
||||
|
||||
input[type="text"] {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
pointer-events: none;
|
||||
|
||||
.overlay-disabled {
|
||||
display: block;
|
||||
}
|
||||
|
||||
input {
|
||||
background-color: #00000033;
|
||||
}
|
||||
}
|
||||
|
||||
.overlay-disabled {
|
||||
display: none;
|
||||
position: absolute;
|
||||
background-color: #00000033;
|
||||
z-index: 1000;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.list {
|
||||
display: flex;
|
||||
position: relative;
|
||||
flex-direction: column;
|
||||
border: lightgray solid 2px;
|
||||
user-select: none;
|
||||
padding-bottom: 2px;
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
|
||||
.header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
background-color: lightgray;
|
||||
padding-left: 0!important;
|
||||
|
||||
& > div {
|
||||
border: grey solid;
|
||||
border-width: 0 2px 0 0;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
& > div:last-of-type {
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
& > .entry {
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
.entry {
|
||||
display: grid;
|
||||
grid-template-columns: auto 100px 100px 100px 100px;
|
||||
|
||||
& > div {
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: #11111122;
|
||||
}
|
||||
|
||||
&.unset {
|
||||
& > .permission-value, & > .permission-skip, & > .permission-negate {
|
||||
visibility: hidden;
|
||||
}
|
||||
& > .permission-name {
|
||||
color: lightgray;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.group {
|
||||
grid-template-columns: auto;
|
||||
grid-template-rows: auto auto;
|
||||
|
||||
.group-entries {
|
||||
margin-left: 50px;
|
||||
}
|
||||
|
||||
|
||||
.title {
|
||||
&.selected {
|
||||
background-color: #11111122;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.arrow {
|
||||
cursor: pointer;
|
||||
pointer-events: all;
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
padding: 0;
|
||||
margin-right: 5px;
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
||||
input {
|
||||
border: none;
|
||||
background: transparent;
|
||||
vertical-align: text-bottom;
|
||||
max-width: 90%;
|
||||
}
|
||||
|
||||
.checkbox {
|
||||
margin-top: 1px;
|
||||
margin-left: 1px;
|
||||
display: block;
|
||||
position: relative;
|
||||
padding-left: 35px;
|
||||
margin-bottom: 12px;
|
||||
cursor: pointer;
|
||||
font-size: 22px;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
/* Hide the browser's default checkbox */
|
||||
input {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.checkmark {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
background-color: #eee;
|
||||
|
||||
&:after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
display: none;
|
||||
|
||||
left: 6px;
|
||||
top: 2px;
|
||||
width: 5px;
|
||||
height: 10px;
|
||||
border: solid white;
|
||||
border-width: 0 3px 3px 0;
|
||||
-webkit-transform: rotate(45deg);
|
||||
-ms-transform: rotate(45deg);
|
||||
transform: rotate(45deg);
|
||||
}
|
||||
}
|
||||
|
||||
&:hover input ~ .checkmark {
|
||||
background-color: #ccc;
|
||||
}
|
||||
|
||||
input:checked ~ .checkmark {
|
||||
background-color: #2196F3;
|
||||
}
|
||||
|
||||
input:checked ~ .checkmark:after {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-ban-type {
|
||||
margin: 5px;
|
||||
}
|
||||
|
|
@ -417,6 +258,7 @@
|
|||
position: relative;
|
||||
width: 175px;
|
||||
flex-grow: 0;
|
||||
min-width: 125px;
|
||||
|
||||
.entries {
|
||||
display: table;
|
||||
|
|
@ -499,30 +341,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.layout-client, .layout-client-channel {
|
||||
.client-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 200px;
|
||||
|
||||
& > div:not(.list-channel) {
|
||||
display: grid;
|
||||
grid-template-columns: auto;
|
||||
grid-template-rows: max-content;
|
||||
}
|
||||
|
||||
.client-info {
|
||||
input {
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.list-channel {
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.group-assignment-list {
|
||||
.group-list {
|
||||
border: lightgray solid 1px;
|
||||
|
|
@ -15,6 +15,10 @@ $ease: cubic-bezier(.45, 0, .55, 1);
|
|||
perspective-origin: 50% 50%;
|
||||
perspective: 1200px;
|
||||
|
||||
label {
|
||||
margin-bottom: 0!important; /* bootstrap fix */
|
||||
}
|
||||
|
||||
.flip-card,
|
||||
.static-card {
|
||||
background: white;
|
||||
|
|
@ -128,17 +132,17 @@ $ease: cubic-bezier(.45, 0, .55, 1);
|
|||
.btn-forward span {
|
||||
background-size: calc(42px * 2) calc(42px * 2);
|
||||
margin-left: 10px;
|
||||
background: url("../../img/music/forward.svg") no-repeat center;
|
||||
background: url("%%base_path%%/img/music/forward.svg") no-repeat center;
|
||||
}
|
||||
.btn-rewind span {
|
||||
background-size: calc(42px * 2) calc(42px * 2);
|
||||
margin-left: 10px;
|
||||
background: url("../../img/music/rewind.svg") no-repeat center;
|
||||
background: url("%%base_path%%/img/music/rewind.svg") no-repeat center;
|
||||
}
|
||||
.btn-settings span {
|
||||
background-size: calc(42px * 2) calc(42px * 2);
|
||||
margin-left: 10px;
|
||||
background: url("../../img/music/playlist.svg") no-repeat center;
|
||||
background: url("%%base_path%%/img/music/playlist.svg") no-repeat center;
|
||||
}
|
||||
}
|
||||
|
||||
127
shared/css/static/ts/chat.scss
Normal file
127
shared/css/static/ts/chat.scss
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
#chat {
|
||||
font-family: Arial, serif;
|
||||
font-size: 12px;
|
||||
/*white-space: pre;*/
|
||||
line-height: 1;
|
||||
padding: 2px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
flex-grow: 1;
|
||||
|
||||
div, a {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.messages {
|
||||
border-color: #6f6f6f;
|
||||
border-radius: 2px 2px 2px 0;
|
||||
border-style: solid;
|
||||
overflow-y: auto;
|
||||
flex-grow: 1;
|
||||
|
||||
.message_box {
|
||||
flex-wrap: wrap;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
height: auto;
|
||||
|
||||
.message {
|
||||
width: 100%;
|
||||
display: inline-block;
|
||||
|
||||
* {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.chats {
|
||||
max-width: 100%;
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
overflow: auto;
|
||||
overflow-y: hidden;
|
||||
white-space: nowrap;
|
||||
margin-top: -1px;
|
||||
display: flex;
|
||||
user-select: none;
|
||||
|
||||
.chat {
|
||||
background: #5f5f5f5f;
|
||||
display: inline-block;
|
||||
border: 1px solid #6f6f6f;
|
||||
border-radius: 0 0 2px 2px;
|
||||
vertical-align: middle;
|
||||
padding-right: 5px;
|
||||
padding-left: 2px;
|
||||
cursor: pointer;
|
||||
height: 18px;
|
||||
|
||||
&.active {
|
||||
background: #11111111;
|
||||
}
|
||||
|
||||
.btn_close {
|
||||
float: none;
|
||||
margin-right: -5px;
|
||||
margin-left: 8px;
|
||||
|
||||
&:hover, &:focus {
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
||||
.name, .chatIcon {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.input {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
height: auto;
|
||||
width: 100%;
|
||||
margin-top: 2px;
|
||||
position: relative;
|
||||
flex-shrink: 0;
|
||||
|
||||
.bmd-form-group {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
margin-right: 5px;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
|
||||
.form-group {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
margin: 0 5px 0 0;
|
||||
|
||||
textarea {
|
||||
height: 30px;
|
||||
min-height: 30px;
|
||||
max-height: 80px;
|
||||
|
||||
resize: vertical;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
padding-top: 1px;
|
||||
padding-bottom: 1px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
width: 16px;
|
||||
height: 16px;
|
||||
|
||||
background: url('../../img/client_icon_sprite.svg') no-repeat;
|
||||
background: url('../../../img/client_icon_sprite.svg') no-repeat;
|
||||
}
|
||||
|
||||
/* Icons x16 */
|
||||
|
|
@ -612,7 +612,7 @@
|
|||
|
||||
.icon_x32 {
|
||||
display: inline-block;
|
||||
background: url('../../img/client_icon_sprite.svg') no-repeat;
|
||||
background: url('../../../img/client_icon_sprite.svg') no-repeat;
|
||||
background-size: calc(496px * 2) calc(400px * 2);
|
||||
height: 32px;
|
||||
width: 32px;
|
||||
|
|
@ -16,6 +16,8 @@ x-content {
|
|||
}
|
||||
|
||||
.tab .tab-content {
|
||||
min-height: 200px;
|
||||
|
||||
border-color: #6f6f6f;
|
||||
border-radius: 0px 2px 2px 2px;
|
||||
border-style: solid;
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
#chat {
|
||||
font-family: Arial;
|
||||
font-size: 12px;
|
||||
/*white-space: pre;*/
|
||||
line-height: 1;
|
||||
padding: 2px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
#chat div {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#chat .messages {
|
||||
border-color: #6f6f6f;
|
||||
border-radius: 2px 2px 2px 0px;
|
||||
border-style: solid;
|
||||
overflow-y: auto;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
#chat .message_box {
|
||||
flex-wrap: wrap;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
#chat .message {
|
||||
width: 100%;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#chat .message *{
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
#chat .chats {
|
||||
max-width: 100%;
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
/*height: 24px;*/
|
||||
overflow: auto;
|
||||
overflow-y: hidden;
|
||||
white-space: nowrap;
|
||||
margin-top: -1px;
|
||||
display: flex;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
#chat .chat {
|
||||
background: #5f5f5f5f;
|
||||
display: inline-block;
|
||||
border: #6f6f6f;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
border-radius: 0px 0px 2px 2px;
|
||||
vertical-align: middle;
|
||||
padding-right: 5px;
|
||||
padding-left: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#chat .active {
|
||||
background: #11111111;
|
||||
}
|
||||
|
||||
#chat a {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
#chat .btn_close {
|
||||
float: none;
|
||||
margin-right: -5px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
#chat .btn_close:hover,
|
||||
#chat .btn_close:focus {
|
||||
color: black;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#chat .input {
|
||||
width: 100%;
|
||||
margin-top: 2px;
|
||||
display: flex;
|
||||
height: auto;
|
||||
position: relative;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
#chat .input .input_box {
|
||||
width: 100%;
|
||||
|
||||
display:inline-block;
|
||||
border: solid 1px #000;
|
||||
height: 22px;
|
||||
min-height: 22px;
|
||||
max-height: 80px;
|
||||
overflow-y: auto;
|
||||
resize: vertical;
|
||||
}
|
||||
|
|
@ -1,216 +0,0 @@
|
|||
.channelTree {
|
||||
width: 100%; max-width: 100%;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
vertical-align: center;
|
||||
outline: none;
|
||||
}
|
||||
.channelTree * {
|
||||
font-family: Arial;
|
||||
font-size: 12px;
|
||||
white-space: pre;
|
||||
line-height: 1;
|
||||
}
|
||||
.channelTree div {
|
||||
max-width: 100%;
|
||||
height: 16px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.channelTree .channel_type {
|
||||
margin-right: 4px;
|
||||
}
|
||||
.channelTree .icon_client_state {
|
||||
margin-right: 4px;
|
||||
}
|
||||
.channelTree .server_type {
|
||||
margin-right: 4px;
|
||||
}
|
||||
|
||||
.channelTree .icons .icon_entry {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
.channelTree img.loading {width: 50px;height: 50px;-webkit-animation:spin 2s linear infinite;-moz-animation:spin 2s linear infinite;animation:spin 2s linear infinite;}
|
||||
@-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
|
||||
@-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
|
||||
@keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
|
||||
|
||||
.channelTree div.l {justify-content: flex-start; }
|
||||
.channelTree div.c {justify-content: center;}
|
||||
.channelTree div.r {justify-content: flex-end;}
|
||||
|
||||
.channelTree div.solidline{ background: url('../images/viewer/spacer_solidline.gif') repeat-x left center;margin: 0px; }
|
||||
.channelTree div.dashline{ background: url('../images/viewer/spacer_dashline.gif') repeat-x left center;margin: 0px; }
|
||||
.channelTree div.dashdotline{ background: url('../images/viewer/spacer_dashdotline.gif') repeat-x left center;margin: 0px; }
|
||||
.channelTree div.dashdotdotline{ background: url('../images/viewer/spacer_dashdotdotline.gif') repeat-x left center;margin: 0px; }
|
||||
.channelTree div.dotline{ background: url('../images/viewer/spacer_dotline.gif') repeat-x left center;margin: 0px; }
|
||||
|
||||
.channelTree div * {vertical-align: middle;display:inline-block;height: 16px;padding: 0px;}
|
||||
.channelTree div img {border: 0;}
|
||||
.channelTree div > span {position: absolute; right: 0;}
|
||||
.channelTree {
|
||||
.name, .group_prefix, .group_suffix, .away {
|
||||
vertical-align: middle;
|
||||
margin-top: 1px;
|
||||
height: 14px;
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.group_prefix {
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.group_suffix {
|
||||
margin-left: 3px;
|
||||
}
|
||||
}
|
||||
.channelTree .own_name {
|
||||
font-weight: bold;
|
||||
display: inline;
|
||||
}
|
||||
.channelTree .channel_name {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.channelTree .channel_name_container {
|
||||
display: inline-flex;
|
||||
width: 100%;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
.channelTree .country {width:16px;height:11px;}
|
||||
|
||||
.channelTree .siblings {
|
||||
position: absolute;
|
||||
margin-top: 16px;
|
||||
margin-bottom: -2px;
|
||||
display: grid;
|
||||
width: 100%;
|
||||
left: 16px;
|
||||
}
|
||||
|
||||
.channelTree .channel {
|
||||
cursor: pointer;
|
||||
margin-top: 1px;
|
||||
}
|
||||
|
||||
.channelTree .clients {
|
||||
position: absolute;
|
||||
margin-top: 16px;
|
||||
margin-bottom: -2px;
|
||||
display: grid;
|
||||
width: 100%;
|
||||
left: 16px;
|
||||
}
|
||||
|
||||
.channelTree .client {
|
||||
cursor: pointer;
|
||||
margin-top: 1px;
|
||||
width: calc(100%);
|
||||
}
|
||||
|
||||
.channelTree .client span > div {
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
||||
.channelTree .server {
|
||||
cursor: pointer;
|
||||
margin-top: 0px;
|
||||
width: calc(100%);
|
||||
}
|
||||
|
||||
.channelTree .channelLine {
|
||||
position: absolute;
|
||||
width: calc(100% - 16px);
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
top: 0px;
|
||||
left: 16px;
|
||||
|
||||
&.move-selected {
|
||||
border: 1px black solid;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.channelTree .selected {
|
||||
background: #005cbf;
|
||||
}
|
||||
|
||||
.clicon {width:16px;height:16px;background:url('../../img/ts/basic_icons.png') no-repeat;background-size: 16px 608px;}
|
||||
.host {background-position: 0 -448px}
|
||||
|
||||
.server_open {background-position: 0 -352px}
|
||||
.server_full {background-position: 0 -128px}
|
||||
.server_pass {background-position: 0 -432px}
|
||||
|
||||
/* Server group icon
|
||||
.group_0 {background-position: 0 -464px}
|
||||
.group_100 {background-position: 0 -16px}
|
||||
.group_200 {background-position: 0 -304px}
|
||||
.group_300 {background-position: 0 -80px}
|
||||
.group_400 {background-position: 0 -528px}
|
||||
.group_500 {background-position: 0 -416px}
|
||||
.group_600 {background-position: 0 -272px}
|
||||
|
||||
.group_server{background-position: 0 -496px}
|
||||
.group_channel {background-position: 0 -400px}
|
||||
|
||||
/* Channel icons
|
||||
.channel_open {background-position: 0 -64px}
|
||||
.channel_pass {background-position: 0 -112px}
|
||||
.channel_full {background-position: 0 -256px}
|
||||
.channel_flag_music {background-position: 0 -32px}
|
||||
.channel_flag_default {background-position: 0 -48px}
|
||||
.channel_flag_moderated {background-position: 0 -192px}
|
||||
.channel_flag_password {background-position: 0 -480px}
|
||||
|
||||
/* Client icons */
|
||||
.client_mic_muted {background-position: 0 -96px}
|
||||
.client_talker {background-position: 0 -144px}
|
||||
.client_idle {background-position: 0 -160px}
|
||||
.client_talk {background-position: 0 -208px}
|
||||
.client_snd_muted {background-position: 0 -176px}
|
||||
.client_query {background-position: 0 -224px}
|
||||
.client_talker_request {background-position: 0 -240px}
|
||||
.client_snd_disabled {background-position: 0 -320px}
|
||||
.client_priority {background-position: 0 -336px}
|
||||
.client_away {background-position: 0 -368px}
|
||||
.client_cc {background-position: 0 -384px}
|
||||
.client_cc_talk {background-position: 0 -544px}
|
||||
.client_cc_idle {background-position: 0 -288px}
|
||||
.client_mic_disabled {background-position: 0 -512px}
|
||||
|
||||
/* Channel tree icons
|
||||
.tree_line {background-position: 0 -560px}
|
||||
.tree_mid {background-position: 0 -576px}
|
||||
.tree_end {background-position: 0 -592px}
|
||||
|
||||
.badges {width:16px;height:16px;background-size: 16px !important;}
|
||||
.badges.overwolf {background:url('../images/viewer/client_overwolf.png') no-repeat;}
|
||||
*/
|
||||
|
||||
/* menu header via data attribute */
|
||||
.data-title:before {
|
||||
content: attr(data-menutitle);
|
||||
display: block;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
left: 0;
|
||||
background: #DDD;
|
||||
padding: 2px;
|
||||
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.data-title :first-child {
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
|
@ -6,29 +6,37 @@ source ../scripts/resolve_commands.sh
|
|||
|
||||
#Generate the loader definitions first
|
||||
LOADER_FILE="declarations/exports_loader.d.ts"
|
||||
if [ -e ${LOADER_FILE} ]; then
|
||||
if [[ -e ${LOADER_FILE} ]]; then
|
||||
rm ${LOADER_FILE}
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to remove loader file!\nThis could be critical later!"
|
||||
fi
|
||||
fi
|
||||
npm run dtsgen -- --config $(pwd)/tsconfig/dtsconfig_loader.json -v
|
||||
if [ ! -e ${LOADER_FILE} ]; then
|
||||
if [[ ! -e ${LOADER_FILE} ]]; then
|
||||
echo "Failed to generate definitions"
|
||||
echo "$result"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
execute_ttsc -p tsconfig/tsconfig_packed.json
|
||||
if [ $? -ne 0 ]; then
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Failed to generate packed file!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#Now link the loader file
|
||||
if [ ! -L generated/load.js ]; then
|
||||
if [[ ! -L generated/load.js ]]; then
|
||||
rm generated/load.js 2>/dev/null
|
||||
ln -rs js/load.js generated/load.js
|
||||
fi
|
||||
|
||||
if [[ ! -d generated/static/ ]]; then
|
||||
mkdir -p generated/static/
|
||||
fi
|
||||
|
||||
# Create packed CSS file
|
||||
find css/static/ -name '*.css' -exec cat {} \; | npm run csso -- --output `pwd`/generated/static/base.css
|
||||
|
||||
echo "Packed file generated!"
|
||||
exit 0
|
||||
|
|
@ -20,6 +20,10 @@
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if(function_exists("setup_forum_auth"))
|
||||
setup_forum_auth();
|
||||
|
||||
$localhost |= gethostname() == "WolverinDEV";
|
||||
if(!$localhost || $testXF) {
|
||||
//redirectOnInvalidSession();
|
||||
|
|
@ -27,11 +31,13 @@
|
|||
|
||||
$WEB_CLIENT = http_response_code() !== false;
|
||||
?>
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="description" content="TeaSpeak Web Client, connect to any TeaSpeak server without installing anything." />
|
||||
|
||||
<?php
|
||||
if(!$WEB_CLIENT) {
|
||||
echo "<title>TeaClient</title>";
|
||||
|
|
@ -40,51 +46,29 @@
|
|||
}
|
||||
?>
|
||||
|
||||
<link rel="stylesheet" href="css/main.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/helptag.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/scroll.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/ts/tab.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/ts/chat.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/ts/client.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/ts/icons.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/general.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modals.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-bookmarks.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-connect.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-query.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-playlist.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-banlist.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-bancreate.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-settings.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/modal-poke.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/loader.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/music/info_plate.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/frame/SelectInfo.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/control_bar.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/context_menu.css" type="text/css">
|
||||
<link rel="stylesheet" href="css/htmltags.css" type="text/css">
|
||||
<link rel="stylesheet" href="vendor/bbcode/xbbcode.css" type="text/css">
|
||||
<!-- https://localhost:9987/?forward_url=http%3A%2F%2Flocalhost%3A63344%2FWeb-Client%2Findex.php%3F_ijt%3D82b1uhmnh0a5l1n35nnjps5eid%26loader_ignore_age%3D1%26connect_default_host%3Dlocalhost%26default_connect_type%3Dforum%26default_connect_url%3Dtrue%26default_connect_type%3Dteamspeak%26default_connect_url%3Dlocalhost%253A9987 -->
|
||||
<!-- PHP generated properies -->
|
||||
<!-- localhost:63342/TeaSpeak-Web/index.php?_ijt=o48hmliefjoa8cer8v7mpl98pj&connect_default_host=192.168.43.141 -->
|
||||
<!-- PHP generated properties -->
|
||||
<x-properties id="properties">
|
||||
<!-- <x-property key="" value=""/> -->
|
||||
<?php
|
||||
function spawnProperty($name, $value)
|
||||
function spawn_property($name, $value, $element_id = null)
|
||||
{
|
||||
echo '<x-property key="' . $name . '" value="' . urlencode($value) . '"></x-property>';
|
||||
if(isset($value))
|
||||
echo "\t\t\t<x-property key=\"" . $name . "\" " . (isset($element_id) ? "id=\"" . $element_id . "\" " : "") . "value=\"" . urlencode($value) . "\"></x-property>\r\n";
|
||||
}
|
||||
|
||||
spawnProperty('connect_default_host', $localhost ? "localhost" : "ts.TeaSpeak.de");
|
||||
spawnProperty('localhost_debug', $localhost ? "true" : "false");
|
||||
spawnProperty('forum_user_data', isset($GLOBALS["COOKIE_NAME_USER_DATA"]) ? $_COOKIE[$GLOBALS["COOKIE_NAME_USER_DATA"]] : "");
|
||||
spawnProperty('forum_user_sign', isset($GLOBALS["COOKIE_NAME_USER_SIGN"]) ? $_COOKIE[$GLOBALS["COOKIE_NAME_USER_SIGN"]] : "");
|
||||
spawnProperty('forum_path', authPath());
|
||||
spawn_property('connect_default_host', $localhost ? "localhost" : "ts.TeaSpeak.de");
|
||||
spawn_property('localhost_debug', $localhost ? "true" : "false");
|
||||
if(isset($_COOKIE)) {
|
||||
if(array_key_exists("COOKIE_NAME_USER_DATA", $GLOBALS) && array_key_exists($GLOBALS["COOKIE_NAME_USER_DATA"], $_COOKIE))
|
||||
spawn_property('forum_user_data', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_DATA"]]);
|
||||
if(array_key_exists("COOKIE_NAME_USER_SIGN", $GLOBALS) && array_key_exists($GLOBALS["COOKIE_NAME_USER_SIGN"], $_COOKIE))
|
||||
spawn_property('forum_user_sign', $_COOKIE[$GLOBALS["COOKIE_NAME_USER_SIGN"]]);
|
||||
}
|
||||
spawn_property('forum_path', authPath());
|
||||
|
||||
$version = file_get_contents("./version");
|
||||
if ($version === false)
|
||||
$version = "unknown";
|
||||
spawnProperty("version", $version);
|
||||
spawn_property("version", $version, "app_version");
|
||||
?>
|
||||
</x-properties>
|
||||
|
||||
|
|
@ -100,20 +84,47 @@
|
|||
gtag('js', new Date());
|
||||
gtag('config', 'UA-113151733-4');
|
||||
</script>
|
||||
<script>
|
||||
//const exports = {};
|
||||
</script>
|
||||
|
||||
<!-- required static style for the critical page and the enable javascript page -->
|
||||
<style>
|
||||
.fulloverlay {
|
||||
z-index: 10000;
|
||||
display: none;
|
||||
position: fixed;
|
||||
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
background-color: gray;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.fulloverlay .container {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
top: 30%;
|
||||
|
||||
max-width: unset!important; /* override bootstrap */
|
||||
}
|
||||
|
||||
.no-js {
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
|
||||
<div id="style">
|
||||
<link rel="stylesheet" href="css/loader/loader.css">
|
||||
</div>
|
||||
<div id="scripts">
|
||||
<script type="application/javascript" src="js/load.js" defer></script>
|
||||
</div>
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
if(true) {
|
||||
?>
|
||||
<!-- No javascript error -->
|
||||
<div style="display: block; position: fixed; top: 0px; bottom: 0px; left: 0px; right: 0px; background-color: gray; z-index: 1000; text-align: center;" class="no-js">
|
||||
<div style="position: relative; display: inline-block; top: 30%">
|
||||
<div class="fulloverlay no-js">
|
||||
<div class="container">
|
||||
<img src="img/script.svg" height="128px">
|
||||
<h1>Please enable JavaScript</h1>
|
||||
<h3>TeaSpeak web could not run without it!</h3>
|
||||
|
|
@ -125,7 +136,6 @@
|
|||
while (elements.length > 0) //Removing these elements (even self)
|
||||
elements.item(0).remove();
|
||||
</script>
|
||||
<?php } ?>
|
||||
|
||||
<!-- Loading screen -->
|
||||
<div class="loader">
|
||||
|
|
@ -145,10 +155,10 @@
|
|||
</div>
|
||||
|
||||
<!-- Critical load error -->
|
||||
<div style="display: none; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: gray; z-index: 1000; text-align: center;" id="critical-load">
|
||||
<div style="position: relative; display: inline-block; top: 30%">
|
||||
<img src="img/script.svg" height="128px">
|
||||
<h1 style="color: red">Got some trouble while loading important files!</h1>
|
||||
<div class="fulloverlay" id="critical-load">
|
||||
<div class="container">
|
||||
<img src="img/loading_error_right.svg" height="192px">
|
||||
<h1 style="color: red">Ooops, we encountered some trouble while loading important files!</h1>
|
||||
<h3 class="detail"></h3>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -162,23 +172,26 @@
|
|||
</div>
|
||||
</body>
|
||||
|
||||
<?php
|
||||
if($WEB_CLIENT) {
|
||||
$TAG = "<footer>
|
||||
<div class=\"container\" style=\"display: flex; flex-direction: row; align-content: space-between;\">
|
||||
<div style=\"align-self: center; position: fixed; left: 5px;\">Open source on <a href=\"https://github.com/TeaSpeak/TeaSpeak-Web\" style=\"display: inline-block; position: relative\">github.com</a></div>
|
||||
<div style=\"align-self: center;\">TeaSpeak Web client (" . $version . ") by WolverinDEV</div>
|
||||
<div style=\"align-self: center; position: fixed; right: 5px;\">";
|
||||
<?php
|
||||
$footer_style = "display: none;";
|
||||
$footer_forum = '';
|
||||
|
||||
if($WEB_CLIENT) {
|
||||
$footer_style = "display: block;";
|
||||
|
||||
if (logged_in()) {
|
||||
$TAG = $TAG . "<a href=\"" . authPath() . "auth.php?type=logout\">logout</a>";
|
||||
$footer_forum = "<a href=\"" . authPath() . "auth.php?type=logout\">logout</a>";
|
||||
} else {
|
||||
$TAG = $TAG . "<a href=\"" . authPath() . "login.php\">Login</a> via the TeaSpeak forum.";
|
||||
$footer_forum = "<a href=\"" . authPath() . "login.php\">Login</a> via the TeaSpeak forum.";
|
||||
}
|
||||
|
||||
echo $TAG . "</div>
|
||||
</div>
|
||||
</footer>";
|
||||
}
|
||||
?>
|
||||
|
||||
<footer style="<?php echo $footer_style; ?>">
|
||||
<div class="container" style="display: flex; flex-direction: row; align-content: space-between;">
|
||||
<div style="align-self: center; position: fixed; left: 5px;">Open source on <a href="https://github.com/TeaSpeak/TeaSpeak-Web" style="display: inline-block; position: relative">github.com</a></div>
|
||||
<div style="align-self: center;">TeaSpeak Web client (<?php echo $version; ?>) by WolverinDEV</div>
|
||||
<div style="align-self: center; position: fixed; right: 5px;"><?php echo $footer_forum; ?></div>
|
||||
</div>
|
||||
</footer>
|
||||
</html>
|
||||
File diff suppressed because it is too large
Load diff
1
shared/img/loading_error.svg
Normal file
1
shared/img/loading_error.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
1
shared/img/loading_error_right.svg
Normal file
1
shared/img/loading_error_right.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
|
|
@ -368,9 +368,9 @@ class IconManager {
|
|||
//$("<img width=\"16\" height=\"16\" alt=\"tick\" src=\"data:image/png;base64," + value.base64 + "\">")
|
||||
generateTag(id: number) : JQuery<HTMLDivElement> {
|
||||
if(id == 0)
|
||||
return $("<div class='icon_empty'></div>");
|
||||
return $.spawn("div").addClass("icon_empty");
|
||||
else if(id < 1000)
|
||||
return $("<div class='icon client-group_" + id + "'></div>");
|
||||
return $.spawn("div").addClass("icon client-group_" + id);
|
||||
|
||||
let tag = $.spawn("div");
|
||||
tag.addClass("icon_empty");
|
||||
|
|
@ -384,7 +384,7 @@ class IconManager {
|
|||
const media = media_image_type(type);
|
||||
console.debug(tr("Icon has an image type of %o (media: %o)"), type, media);
|
||||
img.attr("src", "data:image/" + media + ";base64," + icon.base64);
|
||||
tag.append(img);
|
||||
tag.append(img).removeClass("icon_empty");
|
||||
} else {
|
||||
img.attr("src", "file://null");
|
||||
|
||||
|
|
@ -400,7 +400,7 @@ class IconManager {
|
|||
console.debug(tr("Icon %o loaded :)"), id);
|
||||
|
||||
img.css("opacity", 0);
|
||||
tag.append(img);
|
||||
tag.append(img).removeClass("icon_empty");
|
||||
loader.animate({opacity: 0}, 50, function () {
|
||||
$(this).detach();
|
||||
img.animate({opacity: 1}, 150);
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ class ChatEntry {
|
|||
let tag = $.spawn("div");
|
||||
tag.addClass("chat");
|
||||
|
||||
tag.append("<div class=\"chatIcon icon clicon " + this.chatIcon() + "\"></div>");
|
||||
tag.append("<div class=\"chatIcon icon " + this.chatIcon() + "\"></div>");
|
||||
tag.append("<a class='name'>" + this._name + "</a>");
|
||||
|
||||
let closeTag = $.spawn("div");
|
||||
|
|
@ -288,7 +288,7 @@ class ChatEntry {
|
|||
set unread(flag : boolean) {
|
||||
if(this._unread == flag) return;
|
||||
this._unread = flag;
|
||||
this.htmlTag.find(".chatIcon").attr("class", "chatIcon icon clicon " + this.chatIcon());
|
||||
this.htmlTag.find(".chatIcon").attr("class", "chatIcon icon " + this.chatIcon());
|
||||
if(flag) {
|
||||
this.htmlTag.find(".name").css("color", "blue");
|
||||
} else {
|
||||
|
|
@ -323,11 +323,17 @@ class ChatBox {
|
|||
chats: ChatEntry[];
|
||||
private _activeChat: ChatEntry;
|
||||
|
||||
private _button_send: JQuery;
|
||||
private _input_message: JQuery;
|
||||
|
||||
constructor(htmlTag: JQuery) {
|
||||
this.htmlTag = htmlTag;
|
||||
|
||||
this.htmlTag.find(".input button").click(this.onSend.bind(this));
|
||||
this.htmlTag.find(".input_box").keypress(event => {
|
||||
this._button_send = this.htmlTag.find(".button-send");
|
||||
this._input_message = this.htmlTag.find(".input-message");
|
||||
|
||||
this._button_send.click(this.onSend.bind(this));
|
||||
this._input_message.keypress(event => {
|
||||
if(event.keyCode == JQuery.Key.Enter && !event.shiftKey) {
|
||||
this.onSend();
|
||||
return false;
|
||||
|
|
@ -335,9 +341,9 @@ class ChatBox {
|
|||
}).on('input', (event) => {
|
||||
let text = $(event.target).val().toString();
|
||||
if(this.testMessage(text))
|
||||
this.htmlTag.find(".input button").removeAttr("disabled");
|
||||
this._button_send.removeAttr("disabled");
|
||||
else
|
||||
this.htmlTag.find(".input button").attr("disabled", "true");
|
||||
this._button_send.attr("disabled", "true");
|
||||
}).trigger("input");
|
||||
|
||||
this.chats = [];
|
||||
|
|
@ -394,11 +400,10 @@ class ChatBox {
|
|||
|
||||
|
||||
onSend() {
|
||||
let textBox = $(this.htmlTag).find(".input_box");
|
||||
let text = textBox.val().toString();
|
||||
let text = this._input_message.val().toString();
|
||||
if(!this.testMessage(text)) return;
|
||||
textBox.val("");
|
||||
$(this.htmlTag).find(".input_box").trigger("input");
|
||||
this._input_message.val("");
|
||||
this._input_message.trigger("input");
|
||||
|
||||
if(this._activeChat && $.isFunction(this._activeChat.onMessageSend))
|
||||
this._activeChat.onMessageSend(text);
|
||||
|
|
@ -433,7 +438,7 @@ class ChatBox {
|
|||
break;
|
||||
}
|
||||
}
|
||||
this.htmlTag.find(".input_box").prop("disabled", !flagAllowSend);
|
||||
this._input_message.prop("disabled", !flagAllowSend);
|
||||
}
|
||||
|
||||
get activeChat(){ return this._activeChat; }
|
||||
|
|
@ -447,7 +452,7 @@ class ChatBox {
|
|||
}
|
||||
|
||||
focus(){
|
||||
$(this.htmlTag).find(".input_box").focus();
|
||||
this._input_message.focus();
|
||||
}
|
||||
|
||||
private testMessage(message: string) : boolean {
|
||||
|
|
|
|||
|
|
@ -59,6 +59,8 @@ class TSClient {
|
|||
|
||||
private _clientId: number = 0;
|
||||
private _ownEntry: LocalClientEntry;
|
||||
private _reconnect_timer: NodeJS.Timer;
|
||||
private _reconnect_attempt: boolean = false;
|
||||
|
||||
constructor() {
|
||||
this.selectInfo = new InfoBar(this, $("#select_info"));
|
||||
|
|
@ -78,6 +80,8 @@ class TSClient {
|
|||
}
|
||||
|
||||
startConnection(addr: string, profile: profiles.ConnectionProfile, name?: string, password?: {password: string, hashed: boolean}) {
|
||||
this.cancel_reconnect();
|
||||
this._reconnect_attempt = false;
|
||||
if(this.serverConnection)
|
||||
this.handleDisconnect(DisconnectReason.REQUESTED);
|
||||
|
||||
|
|
@ -166,10 +170,16 @@ class TSClient {
|
|||
}
|
||||
|
||||
handleDisconnect(type: DisconnectReason, data: any = {}) {
|
||||
let auto_reconnect = false;
|
||||
switch (type) {
|
||||
case DisconnectReason.REQUESTED:
|
||||
break;
|
||||
case DisconnectReason.CONNECT_FAILURE:
|
||||
if(this._reconnect_attempt) {
|
||||
auto_reconnect = true;
|
||||
chat.serverChat().appendError(tr("Connect failed"));
|
||||
break;
|
||||
}
|
||||
console.error(tr("Could not connect to remote host! Exception: %o"), data);
|
||||
|
||||
if(native_client) {
|
||||
|
|
@ -203,6 +213,8 @@ class TSClient {
|
|||
tr("The connection was closed by remote host")
|
||||
).open();
|
||||
sound.play(Sound.CONNECTION_DISCONNECTED);
|
||||
|
||||
auto_reconnect = true;
|
||||
break;
|
||||
case DisconnectReason.CONNECTION_PING_TIMEOUT:
|
||||
console.error(tr("Connection ping timeout"));
|
||||
|
|
@ -211,6 +223,7 @@ class TSClient {
|
|||
tr("Connection lost"),
|
||||
tr("Lost connection to remote host (Ping timeout)<br>Even possible?")
|
||||
).open();
|
||||
|
||||
break;
|
||||
case DisconnectReason.SERVER_CLOSED:
|
||||
chat.serverChat().appendError(tr("Server closed ({0})"), data.reasonmsg);
|
||||
|
|
@ -220,6 +233,8 @@ class TSClient {
|
|||
"Reason: " + data.reasonmsg
|
||||
).open();
|
||||
sound.play(Sound.CONNECTION_DISCONNECTED);
|
||||
|
||||
auto_reconnect = true;
|
||||
break;
|
||||
case DisconnectReason.SERVER_REQUIRES_PASSWORD:
|
||||
chat.serverChat().appendError(tr("Server requires password"));
|
||||
|
|
@ -236,6 +251,7 @@ class TSClient {
|
|||
ClientEntry.chatTag(data["invokerid"], data["invokername"], data["invokeruid"]),
|
||||
data["reasonmsg"] ? " (" + data["reasonmsg"] + ")" : "");
|
||||
sound.play(Sound.SERVER_KICKED);
|
||||
auto_reconnect = true;
|
||||
break;
|
||||
case DisconnectReason.CLIENT_BANNED:
|
||||
chat.serverChat().appendError(tr("You got banned from the server by {0}{1}"),
|
||||
|
|
@ -256,5 +272,35 @@ class TSClient {
|
|||
this.controlBar.update_connection_state();
|
||||
this.selectInfo.setCurrentSelected(null);
|
||||
this.selectInfo.update_banner();
|
||||
|
||||
if(auto_reconnect) {
|
||||
if(!this.serverConnection) {
|
||||
console.log(tr("Allowed to auto reconnect but cant reconnect because we dont have any information left..."));
|
||||
return;
|
||||
}
|
||||
chat.serverChat().appendMessage(tr("Reconnecting in 5 seconds"));
|
||||
|
||||
console.log(tr("Allowed to auto reconnect. Reconnecting in 5000ms"));
|
||||
const server_address = this.serverConnection._remote_address;
|
||||
const profile = this.serverConnection._handshakeHandler.profile;
|
||||
const name = this.serverConnection._handshakeHandler.name;
|
||||
const password = this.serverConnection._handshakeHandler.server_password;
|
||||
|
||||
this._reconnect_timer = setTimeout(() => {
|
||||
this._reconnect_timer = undefined;
|
||||
chat.serverChat().appendMessage(tr("Reconnecting..."));
|
||||
console.log(tr("Reconnecting..."));
|
||||
this.startConnection(server_address.host + ":" + server_address.port, profile, name, password ? { password: password, hashed: true} : undefined);
|
||||
this._reconnect_attempt = true;
|
||||
}, 5000);
|
||||
}
|
||||
}
|
||||
|
||||
cancel_reconnect() {
|
||||
if(this._reconnect_timer) {
|
||||
chat.serverChat().appendMessage(tr("Reconnect canceled"));
|
||||
clearTimeout(this._reconnect_timer);
|
||||
this._reconnect_timer = undefined;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -710,6 +710,7 @@ class ConnectionCommandHandler {
|
|||
this.connection = connection;
|
||||
this["error"] = this.handleCommandResult;
|
||||
this["channellist"] = this.handleCommandChannelList;
|
||||
this["channellistfinished"] = this.handleCommandChannelListFinished;
|
||||
this["notifychannelcreated"] = this.handleCommandChannelCreate;
|
||||
this["notifychanneldeleted"] = this.handleCommandChannelDelete;
|
||||
this["notifychannelhide"] = this.handleCommandChannelHide;
|
||||
|
|
@ -843,11 +844,17 @@ class ConnectionCommandHandler {
|
|||
}
|
||||
|
||||
handleCommandChannelList(json) {
|
||||
this.connection._client.channelTree.hide_channel_tree(); /* dont perform channel inserts on the dom to prevent style recalculations */
|
||||
console.log(tr("Got %d new channels"), json.length);
|
||||
for(let index = 0; index < json.length; index++)
|
||||
this.createChannelFromJson(json[index], true);
|
||||
}
|
||||
|
||||
|
||||
handleCommandChannelListFinished(json) {
|
||||
this.connection._client.channelTree.show_channel_tree();
|
||||
}
|
||||
|
||||
handleCommandChannelCreate(json) {
|
||||
this.createChannelFromJson(json[0]);
|
||||
}
|
||||
|
|
@ -900,48 +907,52 @@ class ConnectionCommandHandler {
|
|||
} else {
|
||||
client = new ClientEntry(parseInt(json["clid"]), json["client_nickname"]);
|
||||
}
|
||||
|
||||
client.properties.client_type = parseInt(json["client_type"]);
|
||||
client = tree.insertClient(client, channel);
|
||||
} else {
|
||||
if(client == this.connection._client.getClient())
|
||||
chat.channelChat().name = channel.channelName();
|
||||
tree.moveClient(client, channel);
|
||||
}
|
||||
const own_channel = this.connection._client.getClient().currentChannel();
|
||||
|
||||
if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) {
|
||||
if(own_channel == channel)
|
||||
if(old_channel)
|
||||
sound.play(Sound.USER_ENTERED);
|
||||
else
|
||||
sound.play(Sound.USER_ENTERED_CONNECT);
|
||||
if(old_channel) {
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}"), true, client.createChatTag(true), old_channel.generate_tag(true), channel.generate_tag(true));
|
||||
if(this.connection._client.controlBar.query_visible || client.properties.client_type != ClientType.CLIENT_QUERY) {
|
||||
const own_channel = this.connection._client.getClient().currentChannel();
|
||||
if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) {
|
||||
if(own_channel == channel)
|
||||
if(old_channel)
|
||||
sound.play(Sound.USER_ENTERED);
|
||||
else
|
||||
sound.play(Sound.USER_ENTERED_CONNECT);
|
||||
if(old_channel) {
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}"), true, client.createChatTag(true), old_channel.generate_tag(true), channel.generate_tag(true));
|
||||
} else {
|
||||
chat.serverChat().appendMessage(tr("{0} connected to channel {1}"), true, client.createChatTag(true), channel.generate_tag(true));
|
||||
}
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_MOVED) {
|
||||
if(own_channel == channel)
|
||||
sound.play(Sound.USER_ENTERED_MOVED);
|
||||
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}, moved by {3}"), true,
|
||||
client.createChatTag(true),
|
||||
old_channel ? old_channel.generate_tag(true) : undefined,
|
||||
channel.generate_tag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) {
|
||||
if(own_channel == channel)
|
||||
sound.play(Sound.USER_ENTERED_KICKED);
|
||||
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}, kicked by {3}{4}"), true,
|
||||
client.createChatTag(true),
|
||||
old_channel ? old_channel.generate_tag(true) : undefined,
|
||||
channel.generate_tag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] > 0 ? " (" + json["msg"] + ")" : ""
|
||||
);
|
||||
} else {
|
||||
chat.serverChat().appendMessage(tr("{0} connected to channel {1}"), true, client.createChatTag(true), channel.generate_tag(true));
|
||||
console.warn(tr("Unknown reasonid for %o"), json["reasonid"]);
|
||||
}
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_MOVED) {
|
||||
if(own_channel == channel)
|
||||
sound.play(Sound.USER_ENTERED_MOVED);
|
||||
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}, moved by {3}"), true,
|
||||
client.createChatTag(true),
|
||||
old_channel ? old_channel.generate_tag(true) : undefined,
|
||||
channel.generate_tag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) {
|
||||
if(own_channel == channel)
|
||||
sound.play(Sound.USER_ENTERED_KICKED);
|
||||
|
||||
chat.serverChat().appendMessage(tr("{0} appeared from {1} to {2}, kicked by {3}{4}"), true,
|
||||
client.createChatTag(true),
|
||||
old_channel ? old_channel.generate_tag(true) : undefined,
|
||||
channel.generate_tag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] > 0 ? " (" + json["msg"] + ")" : ""
|
||||
);
|
||||
} else {
|
||||
console.warn(tr("Unknown reasonid for %o"), json["reasonid"]);
|
||||
}
|
||||
|
||||
let updates: {
|
||||
|
|
@ -988,58 +999,59 @@ class ConnectionCommandHandler {
|
|||
return;
|
||||
}
|
||||
|
||||
const own_channel = this.connection._client.getClient().currentChannel();
|
||||
let channel_from = tree.findChannel(json["cfid"]);
|
||||
let channel_to = tree.findChannel(json["ctid"]);
|
||||
if(this.connection._client.controlBar.query_visible || client.properties.client_type != ClientType.CLIENT_QUERY) {
|
||||
const own_channel = this.connection._client.getClient().currentChannel();
|
||||
let channel_from = tree.findChannel(json["cfid"]);
|
||||
let channel_to = tree.findChannel(json["ctid"]);
|
||||
|
||||
if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) {
|
||||
chat.serverChat().appendMessage(tr("{0} disappeared from {1} to {2}"), true, client.createChatTag(true), channel_from.generate_tag(true), channel_to.generate_tag(true));
|
||||
|
||||
if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) {
|
||||
chat.serverChat().appendMessage(tr("{0} disappeared from {1} to {2}"), true, client.createChatTag(true), channel_from.generate_tag(true), channel_to.generate_tag(true));
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_SERVER_LEFT) {
|
||||
chat.serverChat().appendMessage(tr("{0} left the server{1}"), true,
|
||||
client.createChatTag(true),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_SERVER_LEFT) {
|
||||
chat.serverChat().appendMessage(tr("{0} left the server{1}"), true,
|
||||
client.createChatTag(true),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_DISCONNECT);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_SERVER_KICK) {
|
||||
chat.serverChat().appendError(tr("{0} was kicked from the server by {1}.{2}"),
|
||||
client.createChatTag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_KICKED_SERVER);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) {
|
||||
chat.serverChat().appendError(tr("{0} was kicked from your channel by {1}.{2}"),
|
||||
client.createChatTag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_DISCONNECT);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_SERVER_KICK) {
|
||||
chat.serverChat().appendError(tr("{0} was kicked from the server by {1}.{2}"),
|
||||
client.createChatTag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_KICKED_SERVER);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) {
|
||||
chat.serverChat().appendError(tr("{0} was kicked from your channel by {1}.{2}"),
|
||||
client.createChatTag(true),
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_KICKED_CHANNEL);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_BAN) {
|
||||
//"Mulus" was banned for 1 second from the server by "WolverinDEV" (Sry brauchte kurz ein opfer :P <3 (Nohomo))
|
||||
let duration = "permanently";
|
||||
if(json["bantime"])
|
||||
duration = "for " + formatDate(Number.parseInt(json["bantime"]));
|
||||
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_KICKED_CHANNEL);
|
||||
} else if(json["reasonid"] == ViewReasonId.VREASON_BAN) {
|
||||
//"Mulus" was banned for 1 second from the server by "WolverinDEV" (Sry brauchte kurz ein opfer :P <3 (Nohomo))
|
||||
let duration = "permanently";
|
||||
if(json["bantime"])
|
||||
duration = "for " + formatDate(Number.parseInt(json["bantime"]));
|
||||
chat.serverChat().appendError(tr("{0} was banned {1} by {2}.{3}"),
|
||||
client.createChatTag(true),
|
||||
duration,
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
|
||||
chat.serverChat().appendError(tr("{0} was banned {1} by {2}.{3}"),
|
||||
client.createChatTag(true),
|
||||
duration,
|
||||
ClientEntry.chatTag(json["invokerid"], json["invokername"], json["invokeruid"]),
|
||||
json["reasonmsg"] ? " (" + json["reasonmsg"] + ")" : ""
|
||||
);
|
||||
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_BANNED);
|
||||
} else {
|
||||
console.error(tr("Unknown client left reason!"));
|
||||
if(channel_from == own_channel)
|
||||
sound.play(Sound.USER_LEFT_BANNED);
|
||||
} else {
|
||||
console.error(tr("Unknown client left reason!"));
|
||||
}
|
||||
}
|
||||
|
||||
tree.deleteClient(client);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
let context_menu: JQuery;
|
||||
|
||||
$(document).bind("mousedown", function (e) {
|
||||
let menu = $(".context-menu");
|
||||
let menu = context_menu || (context_menu = $(".context-menu"));
|
||||
|
||||
if(!menu.is(":visible")) return;
|
||||
|
||||
if ($(e.target).parents(".context-menu").length == 0) {
|
||||
|
|
@ -9,7 +12,8 @@ $(document).bind("mousedown", function (e) {
|
|||
|
||||
let contextMenuCloseFn = undefined;
|
||||
function despawn_context_menu() {
|
||||
let menu = $(".context-menu");
|
||||
let menu = context_menu || (context_menu = $(".context-menu"));
|
||||
|
||||
if(!menu.is(":visible")) return;
|
||||
menu.hide(100);
|
||||
if(contextMenuCloseFn) contextMenuCloseFn();
|
||||
|
|
@ -102,7 +106,9 @@ function generate_tag(entry: ContextMenuEntry) : JQuery {
|
|||
}
|
||||
|
||||
function spawn_context_menu(x, y, ...entries: ContextMenuEntry[]) {
|
||||
const menu = $("#contextMenu").finish().empty();
|
||||
let menu = context_menu || (context_menu = $(".context-menu"));
|
||||
menu.finish().empty();
|
||||
|
||||
contextMenuCloseFn = undefined;
|
||||
|
||||
for(let entry of entries){
|
||||
|
|
|
|||
|
|
@ -1,3 +1,14 @@
|
|||
namespace app {
|
||||
export enum Type {
|
||||
UNKNOWN,
|
||||
CLIENT_RELEASE,
|
||||
CLIENT_DEBUG,
|
||||
WEB_DEBUG,
|
||||
WEB_RELEASE
|
||||
}
|
||||
export let type: Type = Type.UNKNOWN;
|
||||
}
|
||||
|
||||
namespace loader {
|
||||
type Task = {
|
||||
name: string,
|
||||
|
|
@ -14,6 +25,10 @@ namespace loader {
|
|||
setting up the loading process
|
||||
*/
|
||||
SETUP,
|
||||
/*
|
||||
loading all style sheet files
|
||||
*/
|
||||
STYLE,
|
||||
/*
|
||||
loading all javascript files
|
||||
*/
|
||||
|
|
@ -38,6 +53,7 @@ namespace loader {
|
|||
DONE
|
||||
}
|
||||
|
||||
export let allow_cached_files: boolean = false;
|
||||
let current_stage: Stage = Stage.INITIALIZING;
|
||||
const tasks: {[key:number]:Task[]} = {};
|
||||
|
||||
|
|
@ -62,7 +78,12 @@ namespace loader {
|
|||
}
|
||||
|
||||
export async function execute() {
|
||||
const load_begin = Date.now();
|
||||
|
||||
let begin: number = Date.now();
|
||||
let end: number;
|
||||
while(current_stage <= Stage.LOADED) {
|
||||
|
||||
let current_tasks: Task[] = [];
|
||||
while((tasks[current_stage] || []).length > 0) {
|
||||
if(current_tasks.length == 0 || current_tasks[0].priority == tasks[current_stage][0].priority) {
|
||||
|
|
@ -106,14 +127,17 @@ namespace loader {
|
|||
|
||||
if(current_tasks.length == 0) {
|
||||
if(current_stage < Stage.LOADED)
|
||||
console.debug("[loader] entering next state (%s)", Stage[current_stage + 1]);
|
||||
console.debug("[loader] entering next state (%s). Last state took %dms", Stage[current_stage + 1], (end = Date.now()) - begin);
|
||||
else
|
||||
console.debug("[loader] Finish invoke took %dms", (end = Date.now()) - begin);
|
||||
begin = end;
|
||||
current_stage += 1;
|
||||
}
|
||||
}
|
||||
console.debug("[loader] finished loader.");
|
||||
console.debug("[loader] finished loader. (Total time: %dms)", Date.now() - load_begin);
|
||||
}
|
||||
|
||||
type Script = string | string[];
|
||||
type SourcePath = string | string[];
|
||||
|
||||
function script_name(path: string | string[]) {
|
||||
if(Array.isArray(path)) {
|
||||
|
|
@ -133,7 +157,7 @@ namespace loader {
|
|||
}
|
||||
}
|
||||
|
||||
export async function load_script(path: Script) : Promise<void> {
|
||||
export async function load_script(path: SourcePath) : Promise<void> {
|
||||
if(Array.isArray(path)) { //We have some fallback
|
||||
return load_script(path[0]).catch(error => {
|
||||
if(error instanceof SyntaxError)
|
||||
|
|
@ -151,7 +175,7 @@ namespace loader {
|
|||
let error = false;
|
||||
const error_handler = (event: ErrorEvent) => {
|
||||
if(event.filename == tag.src && event.message.indexOf("Illegal constructor") == -1) { //Our tag throw an uncaught error
|
||||
//console.log("msg: %o, url: %o, line: %o, col: %o, error: %o", event.message, event.filename, event.lineno, event.colno, event.error);
|
||||
console.log("msg: %o, url: %o, line: %o, col: %o, error: %o", event.message, event.filename, event.lineno, event.colno, event.error);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
|
||||
reject(new SyntaxError(event.error));
|
||||
|
|
@ -161,28 +185,36 @@ namespace loader {
|
|||
};
|
||||
window.addEventListener('error', error_handler as any);
|
||||
|
||||
const timeout_handle = setTimeout(() => {
|
||||
reject("timeout");
|
||||
}, 5000);
|
||||
tag.type = "application/javascript";
|
||||
tag.async = true;
|
||||
tag.defer = true;
|
||||
tag.onerror = error => {
|
||||
clearTimeout(timeout_handle);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
tag.remove();
|
||||
reject(error);
|
||||
};
|
||||
tag.onload = () => {
|
||||
clearTimeout(timeout_handle);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
console.debug("Script %o loaded", path);
|
||||
setTimeout(resolve, 100);
|
||||
};
|
||||
|
||||
document.getElementById("scripts").appendChild(tag);
|
||||
tag.src = path;
|
||||
|
||||
tag.src = path + (allow_cached_files ? "" : "?_ts=" + Date.now());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export async function load_scripts(paths: Script[]) : Promise<void> {
|
||||
export async function load_scripts(paths: SourcePath[]) : Promise<void> {
|
||||
const promises: Promise<void>[] = [];
|
||||
const errors: {
|
||||
script: Script,
|
||||
script: SourcePath,
|
||||
error: any
|
||||
}[] = [];
|
||||
|
||||
|
|
@ -206,6 +238,115 @@ namespace loader {
|
|||
throw "failed to load script " + script_name(errors[0].script);
|
||||
}
|
||||
}
|
||||
|
||||
export async function load_style(path: SourcePath) : Promise<void> {
|
||||
if(Array.isArray(path)) { //We have some fallback
|
||||
return load_script(path[0]).catch(error => {
|
||||
if(error instanceof SyntaxError)
|
||||
return Promise.reject(error.source);
|
||||
|
||||
if(path.length > 1)
|
||||
return load_script(path.slice(1));
|
||||
|
||||
return Promise.reject(error);
|
||||
});
|
||||
} else {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
const tag: HTMLLinkElement = document.createElement("link");
|
||||
|
||||
let error = false;
|
||||
const error_handler = (event: ErrorEvent) => {
|
||||
console.log("msg: %o, url: %o, line: %o, col: %o, error: %o", event.message, event.filename, event.lineno, event.colno, event.error);
|
||||
if(event.filename == tag.href) { //FIXME!
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
|
||||
reject(new SyntaxError(event.error));
|
||||
event.preventDefault();
|
||||
error = true;
|
||||
}
|
||||
};
|
||||
window.addEventListener('error', error_handler as any);
|
||||
|
||||
const timeout_handle = setTimeout(() => {
|
||||
reject("timeout");
|
||||
}, 5000);
|
||||
|
||||
tag.type = "text/css";
|
||||
tag.rel="stylesheet";
|
||||
|
||||
tag.onerror = error => {
|
||||
clearTimeout(timeout_handle);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
tag.remove();
|
||||
console.error("File load error for file %s: %o", path, error);
|
||||
reject("failed to load file " + path);
|
||||
};
|
||||
tag.onload = () => {
|
||||
{
|
||||
const css: CSSStyleSheet = tag.sheet as CSSStyleSheet;
|
||||
const rules = css.cssRules;
|
||||
const rules_remove: number[] = [];
|
||||
const rules_add: string[] = [];
|
||||
|
||||
for(let index = 0; index < rules.length; index++) {
|
||||
const rule = rules.item(index);
|
||||
let rule_text = rule.cssText;
|
||||
|
||||
if(rule.cssText.indexOf("%%base_path%%") != -1) {
|
||||
rules_remove.push(index);
|
||||
rules_add.push(rule_text.replace("%%base_path%%", document.location.origin + document.location.pathname));
|
||||
}
|
||||
}
|
||||
|
||||
for(const index of rules_remove.sort((a, b) => b > a ? 1 : 0)) {
|
||||
if(css.removeRule)
|
||||
css.removeRule(index);
|
||||
else
|
||||
css.deleteRule(index);
|
||||
}
|
||||
for(const rule of rules_add)
|
||||
css.insertRule(rule, rules_remove[0]);
|
||||
}
|
||||
|
||||
clearTimeout(timeout_handle);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
console.debug("Style sheet %o loaded", path);
|
||||
setTimeout(resolve, 100);
|
||||
};
|
||||
|
||||
document.getElementById("style").appendChild(tag);
|
||||
tag.href = path + (allow_cached_files ? "" : "?_ts=" + Date.now());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export async function load_styles(paths: SourcePath[]) : Promise<void> {
|
||||
const promises: Promise<void>[] = [];
|
||||
const errors: {
|
||||
sheet: SourcePath,
|
||||
error: any
|
||||
}[] = [];
|
||||
|
||||
for(const sheet of paths)
|
||||
promises.push(load_style(sheet).catch(error => {
|
||||
errors.push({
|
||||
sheet: sheet,
|
||||
error: error
|
||||
});
|
||||
return Promise.resolve();
|
||||
}));
|
||||
|
||||
await Promise.all([...promises]);
|
||||
|
||||
if(errors.length > 0) {
|
||||
console.error("Failed to load the following style sheet:");
|
||||
for(const sheet of errors)
|
||||
console.log(" - %o: %o", sheet.sheet, sheet.error);
|
||||
|
||||
displayCriticalError("Failed to load style sheet " + script_name(errors[0].sheet) + " <br>" + "View the browser console for more information!");
|
||||
throw "failed to load style sheet " + script_name(errors[0].sheet);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* define that here */
|
||||
|
|
@ -247,6 +388,28 @@ function displayCriticalError(message: string) {
|
|||
|
||||
/* all javascript loaders */
|
||||
const loader_javascript = {
|
||||
detect_type: async () => {
|
||||
/* test if js/proto.js is available. If so we're in debug mode */
|
||||
const request = new XMLHttpRequest();
|
||||
request.open('GET', 'js/proto.js', true);
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
request.onreadystatechange = () => {
|
||||
if (request.readyState === 4){
|
||||
if (request.status === 404) {
|
||||
app.type = app.Type.WEB_RELEASE;
|
||||
} else {
|
||||
app.type = app.Type.WEB_DEBUG;
|
||||
}
|
||||
resolve();
|
||||
}
|
||||
};
|
||||
request.onerror = () => {
|
||||
reject("Failed to detect app type");
|
||||
};
|
||||
request.send();
|
||||
});
|
||||
},
|
||||
load_scripts: async () => {
|
||||
/*
|
||||
if(window.require !== undefined) {
|
||||
|
|
@ -263,6 +426,19 @@ const loader_javascript = {
|
|||
if(!window.require) {
|
||||
await loader.load_script(["vendor/jquery/jquery.min.js"]);
|
||||
}
|
||||
|
||||
/* bootstrap material design and libs */
|
||||
await loader.load_script(["vendor/popper/popper.js"]);
|
||||
|
||||
//depends on popper
|
||||
await loader.load_script(["vendor/bootstrap-material/bootstrap-material-design.js"]);
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "materialize body",
|
||||
priority: 10,
|
||||
function: async () => { $(document).ready(function() { $('body').bootstrapMaterialDesign(); }); }
|
||||
});
|
||||
|
||||
await loader.load_script("vendor/jsrender/jsrender.min.js");
|
||||
await loader.load_scripts([
|
||||
["vendor/bbcode/xbbcode.js"],
|
||||
|
|
@ -270,21 +446,18 @@ const loader_javascript = {
|
|||
["https://webrtc.github.io/adapter/adapter-latest.js"]
|
||||
]);
|
||||
|
||||
try {
|
||||
await loader.load_script("js/proto.js");
|
||||
//we're loading for debug
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "scripts debug",
|
||||
priority: 20,
|
||||
function: loader_javascript.load_scripts_debug
|
||||
});
|
||||
} catch(error) {
|
||||
if(app.type == app.Type.WEB_RELEASE || app.type == app.Type.CLIENT_RELEASE) {
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "scripts release",
|
||||
priority: 20,
|
||||
function: loader_javascript.loadRelease
|
||||
});
|
||||
} else {
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "scripts debug",
|
||||
priority: 20,
|
||||
function: loader_javascript.load_scripts_debug
|
||||
});
|
||||
}
|
||||
},
|
||||
load_scripts_debug: async () => {
|
||||
|
|
@ -297,10 +470,10 @@ const loader_javascript = {
|
|||
})
|
||||
}
|
||||
|
||||
/* load the main app */
|
||||
await loader.load_scripts([
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
|
||||
//Load general API's
|
||||
"js/proto.js",
|
||||
"js/i18n/localize.js",
|
||||
"js/log.js",
|
||||
|
||||
|
|
@ -328,7 +501,6 @@ const loader_javascript = {
|
|||
"js/ui/modal/ModalSettings.js",
|
||||
"js/ui/modal/ModalCreateChannel.js",
|
||||
"js/ui/modal/ModalServerEdit.js",
|
||||
"js/ui/modal/ModalConnect.js",
|
||||
"js/ui/modal/ModalChangeVolume.js",
|
||||
"js/ui/modal/ModalBanClient.js",
|
||||
"js/ui/modal/ModalBanCreate.js",
|
||||
|
|
@ -372,10 +544,9 @@ const loader_javascript = {
|
|||
"js/client.js",
|
||||
"js/chat.js",
|
||||
|
||||
"js/PPTListener.js"
|
||||
]);
|
||||
"js/PPTListener.js",
|
||||
|
||||
|
||||
await loader.load_scripts([
|
||||
"js/codec/CodecWrapperWorker.js",
|
||||
"js/profiles/identities/NameIdentity.js", //Depends on Identity
|
||||
"js/profiles/identities/TeaForumIdentity.js", //Depends on Identity
|
||||
|
|
@ -397,7 +568,6 @@ const loader_javascript = {
|
|||
|
||||
await loader.load_scripts([
|
||||
//Load general API's
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
["js/client.min.js", "js/client.js"]
|
||||
]);
|
||||
}
|
||||
|
|
@ -405,6 +575,7 @@ const loader_javascript = {
|
|||
|
||||
const loader_webassembly = {
|
||||
test_webassembly: async () => {
|
||||
/* We dont required WebAssembly anymore for fundamental functions, only for auto decoding
|
||||
if(typeof (WebAssembly) === "undefined" || typeof (WebAssembly.compile) === "undefined") {
|
||||
console.log(navigator.browserSpecs);
|
||||
if (navigator.browserSpecs.name == 'Safari') {
|
||||
|
|
@ -419,43 +590,67 @@ const loader_webassembly = {
|
|||
displayCriticalError("You require WebAssembly for TeaSpeak-Web!");
|
||||
throw "Missing web assembly";
|
||||
}
|
||||
},
|
||||
setup_awaiter: async () => {
|
||||
Module['_initialized'] = false;
|
||||
Module['_initialized_callback'] = undefined;
|
||||
|
||||
Module['onRuntimeInitialized'] = () => {
|
||||
Module['_initialized'] = true;
|
||||
if(Module['_initialized_callback'])
|
||||
Module['_initialized_callback']();
|
||||
};
|
||||
|
||||
Module['onAbort'] = message => {
|
||||
if(!loader.finished()) {
|
||||
Module['onAbort'] = undefined;
|
||||
Module['_initialized'] = false;
|
||||
displayCriticalError("Could not load webassembly files!<br>Message: <code>" + message + "</code>");
|
||||
}
|
||||
};
|
||||
|
||||
Module['locateFile'] = file => "wasm/" + file;
|
||||
},
|
||||
awaiter: () => new Promise<void>((resolve, reject) => {
|
||||
if(!Module['onAbort']) /* an error has been already encountered */
|
||||
reject();
|
||||
else if(!Module['_initialized'])
|
||||
Module['_initialized_callback'] = resolve;
|
||||
else
|
||||
resolve();
|
||||
})
|
||||
*/
|
||||
}
|
||||
};
|
||||
|
||||
const loader_style = {
|
||||
load_style: async () => {
|
||||
await loader.load_styles([
|
||||
"vendor/bbcode/xbbcode.css"
|
||||
]);
|
||||
|
||||
if(app.type == app.Type.WEB_DEBUG || app.type == app.Type.CLIENT_DEBUG) {
|
||||
await loader_style.load_style_debug();
|
||||
} else {
|
||||
await loader_style.load_style_release();
|
||||
}
|
||||
|
||||
/* the material design */
|
||||
await loader.load_style("css/theme/bootstrap-material-design.css");
|
||||
},
|
||||
|
||||
load_style_debug: async () => {
|
||||
await loader.load_styles([
|
||||
"css/static/main.css",
|
||||
"css/static/helptag.css",
|
||||
"css/static/scroll.css",
|
||||
"css/static/channel-tree.css",
|
||||
"css/static/ts/tab.css",
|
||||
"css/static/ts/chat.css",
|
||||
"css/static/ts/icons.css",
|
||||
"css/static/general.css",
|
||||
"css/static/modals.css",
|
||||
"css/static/modal-bookmarks.css",
|
||||
"css/static/modal-connect.css",
|
||||
"css/static/modal-channel.css",
|
||||
"css/static/modal-query.css",
|
||||
"css/static/modal-playlist.css",
|
||||
"css/static/modal-banlist.css",
|
||||
"css/static/modal-bancreate.css",
|
||||
"css/static/modal-settings.css",
|
||||
"css/static/modal-poke.css",
|
||||
"css/static/modal-server.css",
|
||||
"css/static/modal-permissions.css",
|
||||
"css/static/music/info_plate.css",
|
||||
"css/static/frame/SelectInfo.css",
|
||||
"css/static/control_bar.css",
|
||||
"css/static/context_menu.css",
|
||||
"css/static/htmltags.css"
|
||||
]);
|
||||
},
|
||||
|
||||
load_style_release: async () => {
|
||||
await loader.load_styles([
|
||||
"css/static/base.css",
|
||||
"css/static/main.css",
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
async function load_templates() {
|
||||
try {
|
||||
const response = await $.ajax("templates.html", {
|
||||
cache: false, //Change this when in release mode
|
||||
});
|
||||
const response = await $.ajax("templates.html" + (loader.allow_cached_files ? "" : "?_ts" + Date.now()));
|
||||
|
||||
let node = document.createElement("html");
|
||||
node.innerHTML = response;
|
||||
|
|
@ -481,6 +676,44 @@ async function load_templates() {
|
|||
}
|
||||
}
|
||||
|
||||
/* test if all files shall be load from cache or fetch again */
|
||||
async function check_updates() {
|
||||
const app_version = (() => {
|
||||
const version_node = document.getElementById("app_version");
|
||||
if(!version_node) return undefined;
|
||||
|
||||
const version = version_node.hasAttribute("value") ? version_node.getAttribute("value") : undefined;
|
||||
if(!version) return undefined;
|
||||
|
||||
if(version == "unknown" || version.replace("0", "").length == 0)
|
||||
return undefined;
|
||||
|
||||
return version;
|
||||
})();
|
||||
console.log("Found current app version: %o", app_version);
|
||||
|
||||
if(!app_version) {
|
||||
/* TODO add warning */
|
||||
loader.allow_cached_files = false;
|
||||
return;
|
||||
}
|
||||
const cached_version = localStorage.getItem("cached_version");
|
||||
if(!cached_version || cached_version != app_version) {
|
||||
loader.allow_cached_files = false;
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
priority: 0,
|
||||
name: "cached version updater",
|
||||
function: async () => {
|
||||
localStorage.setItem("cached_version", app_version);
|
||||
}
|
||||
});
|
||||
/* loading screen */
|
||||
return;
|
||||
}
|
||||
|
||||
loader.allow_cached_files = true;
|
||||
}
|
||||
|
||||
interface Window {
|
||||
$: JQuery;
|
||||
}
|
||||
|
|
@ -527,9 +760,7 @@ function fadeoutLoader(duration = undefined, minAge = undefined, ignoreAge = und
|
|||
}
|
||||
|
||||
|
||||
if(typeof Module === "undefined")
|
||||
this["Module"] = {};
|
||||
|
||||
window["Module"] = window["Module"] || {};
|
||||
navigator.browserSpecs = (function(){
|
||||
let ua = navigator.userAgent, tem, M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
|
||||
if(/trident/i.test(M[1])){
|
||||
|
|
@ -590,24 +821,29 @@ loader.register_task(loader.Stage.INITIALIZING, {
|
|||
});
|
||||
|
||||
loader.register_task(loader.Stage.INITIALIZING, {
|
||||
name: "webassembly setup",
|
||||
function: loader_webassembly.setup_awaiter,
|
||||
priority: 10
|
||||
name: "app type test",
|
||||
function: loader_javascript.detect_type,
|
||||
priority: 20
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "javascript webassembly",
|
||||
function: loader_webassembly.awaiter,
|
||||
priority: 10
|
||||
loader.register_task(loader.Stage.INITIALIZING, {
|
||||
name: "update tester",
|
||||
priority: 60,
|
||||
function: check_updates
|
||||
});
|
||||
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "javascript",
|
||||
function: loader_javascript.load_scripts,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.STYLE, {
|
||||
name: "style",
|
||||
function: loader_style.load_style,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.TEMPLATES, {
|
||||
name: "templates",
|
||||
function: load_templates,
|
||||
|
|
@ -622,6 +858,17 @@ loader.register_task(loader.Stage.LOADED, {
|
|||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
name: "error task",
|
||||
function: async () => {
|
||||
if(Settings.instance.static("dummy_load_error", false)) {
|
||||
displayCriticalError("The tea is cold!");
|
||||
throw "The tea is cold!";
|
||||
}
|
||||
},
|
||||
priority: 20
|
||||
});
|
||||
|
||||
loader.execute().then(() => {
|
||||
console.log("app successfully loaded!");
|
||||
}).catch(error => {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
enum LogCategory {
|
||||
CHANNEL,
|
||||
CHANNEL_PROPERTIES, /* separating channel and channel properties because on channel init logging is a big bottleneck */
|
||||
CLIENT,
|
||||
SERVER,
|
||||
PERMISSIONS,
|
||||
|
|
@ -19,16 +20,44 @@ namespace log {
|
|||
}
|
||||
|
||||
let category_mapping = new Map<number, string>([
|
||||
[LogCategory.CHANNEL, "Channel "],
|
||||
[LogCategory.CLIENT, "Client "],
|
||||
[LogCategory.SERVER, "Server "],
|
||||
[LogCategory.PERMISSIONS, "Permission "],
|
||||
[LogCategory.GENERAL, "General "],
|
||||
[LogCategory.NETWORKING, "Network "],
|
||||
[LogCategory.VOICE, "Voice "],
|
||||
[LogCategory.I18N, "I18N "]
|
||||
[LogCategory.CHANNEL, "Channel "],
|
||||
[LogCategory.CLIENT, "Channel "],
|
||||
[LogCategory.CHANNEL_PROPERTIES, "Client "],
|
||||
[LogCategory.SERVER, "Server "],
|
||||
[LogCategory.PERMISSIONS, "Permission "],
|
||||
[LogCategory.GENERAL, "General "],
|
||||
[LogCategory.NETWORKING, "Network "],
|
||||
[LogCategory.VOICE, "Voice "],
|
||||
[LogCategory.I18N, "I18N "]
|
||||
]);
|
||||
|
||||
export let enabled_mapping = new Map<number, boolean>([
|
||||
[LogCategory.CHANNEL, true],
|
||||
[LogCategory.CHANNEL_PROPERTIES, false],
|
||||
[LogCategory.CLIENT, true],
|
||||
[LogCategory.SERVER, true],
|
||||
[LogCategory.PERMISSIONS, true],
|
||||
[LogCategory.GENERAL, true],
|
||||
[LogCategory.NETWORKING, true],
|
||||
[LogCategory.VOICE, true],
|
||||
[LogCategory.I18N, true]
|
||||
]);
|
||||
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
name: "log enabled initialisation",
|
||||
function: async () => initialize(),
|
||||
priority: 10
|
||||
});
|
||||
|
||||
//Example: <url>?log.i18n.enabled=0
|
||||
export function initialize() {
|
||||
for(const category of Object.keys(LogCategory).map(e => parseInt(e))) {
|
||||
if(isNaN(category)) continue;
|
||||
const category_name = LogCategory[category];
|
||||
enabled_mapping[category] = settings.static_global<boolean>("log." + category_name.toLowerCase() + ".enabled", enabled_mapping.get(category));
|
||||
}
|
||||
}
|
||||
|
||||
function logDirect(type: LogType, message: string, ...optionalParams: any[]) {
|
||||
switch (type) {
|
||||
case LogType.TRACE:
|
||||
|
|
@ -49,6 +78,8 @@ namespace log {
|
|||
}
|
||||
|
||||
export function log(type: LogType, category: LogCategory, message: string, ...optionalParams: any[]) {
|
||||
if(!enabled_mapping[category]) return;
|
||||
|
||||
optionalParams.unshift(category_mapping.get(category));
|
||||
message = "[%s] " + message;
|
||||
logDirect(type, message, ...optionalParams);
|
||||
|
|
@ -84,6 +115,8 @@ namespace log {
|
|||
export class Group {
|
||||
readonly level: LogType;
|
||||
readonly category: LogCategory;
|
||||
readonly enabled: boolean;
|
||||
|
||||
owner: Group = undefined;
|
||||
|
||||
private readonly name: string;
|
||||
|
|
@ -96,6 +129,7 @@ namespace log {
|
|||
this.category = category;
|
||||
this.name = name;
|
||||
this.optionalParams = optionalParams;
|
||||
this.enabled = enabled_mapping[category];
|
||||
}
|
||||
|
||||
group(level: LogType, name: string, ...optionalParams: any[]) : Group {
|
||||
|
|
@ -108,6 +142,9 @@ namespace log {
|
|||
}
|
||||
|
||||
log(message: string, ...optionalParams: any[]) : this {
|
||||
if(!this.enabled)
|
||||
return this;
|
||||
|
||||
if(!this.initialized) {
|
||||
if(this._collapsed && console.groupCollapsed)
|
||||
console.groupCollapsed(this.name, ...this.optionalParams);
|
||||
|
|
|
|||
|
|
@ -138,6 +138,8 @@ async function initialize() {
|
|||
displayCriticalError(tr("Failed to initialize ppt!"));
|
||||
return;
|
||||
}
|
||||
|
||||
setup_close();
|
||||
}
|
||||
|
||||
function ab2str(buf) {
|
||||
|
|
@ -236,26 +238,17 @@ function main() {
|
|||
chat = new ChatBox($("#chat"));
|
||||
globalClient.setup();
|
||||
|
||||
|
||||
if(!settings.static(Settings.KEY_DISABLE_UNLOAD_DIALOG, false) && !native_client) {
|
||||
|
||||
}
|
||||
//Modals.spawnConnectModal();
|
||||
//Modals.spawnSettingsModal();
|
||||
//Modals.createChannelModal(undefined);
|
||||
|
||||
if(settings.static("connect_default", false) && settings.static("connect_address", "")) {
|
||||
const profile_uuid = settings.static("connect_profile") as string;
|
||||
console.log("UUID: %s", profile_uuid);
|
||||
const profile = profiles.find_profile(profile_uuid) || profiles.default_profile();
|
||||
console.log("UUID: %s", profile.id);
|
||||
const address = settings.static("connect_address", "");
|
||||
const username = settings.static("connect_username", "Another TeaSpeak user");
|
||||
|
||||
const password = settings.static("connect_password", "");
|
||||
const password_hashed = settings.static("connect_password_hashed", false);
|
||||
|
||||
if(profile.valid()) {
|
||||
if(profile && profile.valid()) {
|
||||
globalClient.startConnection(address, profile, username, password.length > 0 ? {
|
||||
password: password,
|
||||
hashed: password_hashed
|
||||
|
|
@ -270,23 +263,6 @@ function main() {
|
|||
});
|
||||
}
|
||||
}
|
||||
/*
|
||||
let tag = $("#tmpl_music_frame").renderTag({
|
||||
//thumbnail: "img/loading_image.svg"
|
||||
});
|
||||
|
||||
|
||||
|
||||
$("#music-test").replaceWith(tag);
|
||||
|
||||
Modals.spawnSettingsModal();
|
||||
/*
|
||||
Modals.spawnYesNo("Are your sure?", "Do you really want to exit?", flag => {
|
||||
console.log("Response: " + flag);
|
||||
})
|
||||
*/
|
||||
|
||||
setup_close();
|
||||
|
||||
let _resize_timeout: NodeJS.Timer;
|
||||
$(window).on('resize', () => {
|
||||
|
|
|
|||
|
|
@ -346,6 +346,11 @@ class PermissionInfo {
|
|||
name: string;
|
||||
id: number;
|
||||
description: string;
|
||||
|
||||
is_boolean() { return this.name.startsWith("b_"); }
|
||||
id_grant() : number {
|
||||
return this.id | (1 << 15);
|
||||
}
|
||||
}
|
||||
|
||||
class PermissionGroup {
|
||||
|
|
@ -369,7 +374,7 @@ class PermissionValue {
|
|||
flag_negate: boolean;
|
||||
granted_value: number;
|
||||
|
||||
constructor(type, value) {
|
||||
constructor(type, value?) {
|
||||
this.type = type;
|
||||
this.value = value;
|
||||
}
|
||||
|
|
@ -382,7 +387,10 @@ class PermissionValue {
|
|||
}
|
||||
|
||||
hasValue() : boolean {
|
||||
return this.value != -2;
|
||||
return typeof(this.value) !== "undefined" && this.value != -2;
|
||||
}
|
||||
hasGrant() : boolean {
|
||||
return typeof(this.granted_value) !== "undefined" && this.granted_value != -2;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -459,6 +467,8 @@ class PermissionManager {
|
|||
public static parse_permission_bulk(json: any[], manager: PermissionManager) : PermissionValue[] {
|
||||
let permissions: PermissionValue[] = [];
|
||||
for(let perm of json) {
|
||||
if(perm["permid"] === undefined) continue;
|
||||
|
||||
let perm_id = parseInt(perm["permid"]);
|
||||
let perm_grant = (perm_id & (1 << 15)) > 0;
|
||||
if(perm_grant)
|
||||
|
|
|
|||
|
|
@ -396,7 +396,13 @@ namespace profiles.identities {
|
|||
|
||||
export class TeaSpeakIdentity implements Identity {
|
||||
static async generate_new() : Promise<TeaSpeakIdentity> {
|
||||
const key = await crypto.subtle.generateKey({name:'ECDH', namedCurve: 'P-256'}, true, ["deriveKey"]);
|
||||
let key: CryptoKeyPair;
|
||||
try {
|
||||
key = await crypto.subtle.generateKey({name:'ECDH', namedCurve: 'P-256'}, true, ["deriveKey"]);
|
||||
} catch(e) {
|
||||
console.error(tr("Could not generate a new key: %o"), e);
|
||||
throw "Failed to generate keypair";
|
||||
}
|
||||
const private_key = await CryptoHelper.export_ecc_key(key.privateKey, false);
|
||||
|
||||
const identity = new TeaSpeakIdentity(private_key, "0", undefined, false);
|
||||
|
|
@ -580,7 +586,7 @@ namespace profiles.identities {
|
|||
return await this.improve_level(-1, threads, () => active);
|
||||
}
|
||||
|
||||
async improve_level(target: number, threads: number, active_callback: () => boolean, callback_level?: (current: number) => any) : Promise<Boolean> {
|
||||
async improve_level(target: number, threads: number, active_callback: () => boolean, callback_level?: (current: number) => any, callback_status?: (hash_rate: number) => any) : Promise<Boolean> {
|
||||
if(!this._initialized || !this.public_key)
|
||||
throw "not initialized";
|
||||
if(target == -1) /* get the highest level possible */
|
||||
|
|
@ -625,6 +631,24 @@ namespace profiles.identities {
|
|||
let target_level = target > 0 ? target : await this.level() + 1;
|
||||
|
||||
const worker_promise: Promise<void>[] = [];
|
||||
|
||||
const hash_timestamps: number[] = [];
|
||||
let last_hashrate_update: number = 0;
|
||||
|
||||
const update_hashrate = () => {
|
||||
if(!callback_status) return;
|
||||
const now = Date.now();
|
||||
hash_timestamps.push(now);
|
||||
|
||||
if(last_hashrate_update + 1000 < now) {
|
||||
last_hashrate_update = now;
|
||||
|
||||
const timeout = now - 10 * 1000; /* 10s */
|
||||
const rounds = hash_timestamps.filter(e => e > timeout);
|
||||
callback_status(Math.ceil((rounds.length * iterations) / Math.ceil((now - rounds[0]) / 1000)))
|
||||
}
|
||||
};
|
||||
|
||||
try {
|
||||
result = await new Promise<boolean>((resolve, reject) => {
|
||||
let active = true;
|
||||
|
|
@ -644,6 +668,8 @@ namespace profiles.identities {
|
|||
|
||||
const promise = worker.mine(next_hash(), iterations, target_level);
|
||||
const p = promise.then(result => {
|
||||
update_hashrate();
|
||||
|
||||
worker_promise.remove(p);
|
||||
|
||||
if(result.valueOf()) {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,15 @@ interface JQuery<TElement = HTMLElement> {
|
|||
render(values?: any) : string;
|
||||
renderTag(values?: any) : JQuery<TElement>;
|
||||
hasScrollBar() : boolean;
|
||||
|
||||
|
||||
visible_height() : number;
|
||||
visible_width() : number;
|
||||
|
||||
/* bootstrap */
|
||||
alert() : JQuery<TElement>;
|
||||
modal(properties: any) : this;
|
||||
bootstrapMaterialDesign() : this;
|
||||
}
|
||||
|
||||
interface JQueryStatic<TElement extends Node = HTMLElement> {
|
||||
|
|
@ -133,6 +142,32 @@ if(typeof ($) !== "undefined") {
|
|||
return this.get(0).scrollHeight > this.height();
|
||||
}
|
||||
|
||||
if(!$.fn.visible_height)
|
||||
$.fn.visible_height = function (this: JQuery<HTMLElement>) {
|
||||
const original_style = this.attr("style");
|
||||
this.css({
|
||||
position: 'absolute!important',
|
||||
visibility: 'hidden!important',
|
||||
display: 'block!important'
|
||||
});
|
||||
|
||||
const result = this.height();
|
||||
this.attr("style", original_style || "");
|
||||
return result;
|
||||
}
|
||||
if(!$.fn.visible_width)
|
||||
$.fn.visible_width = function (this: JQuery<HTMLElement>) {
|
||||
const original_style = this.attr("style");
|
||||
this.css({
|
||||
position: 'absolute!important',
|
||||
visibility: 'hidden!important',
|
||||
display: 'block!important'
|
||||
});
|
||||
|
||||
const result = this.width();
|
||||
this.attr("style", original_style || "");
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
if (!String.prototype.format) {
|
||||
|
|
|
|||
|
|
@ -51,20 +51,19 @@ class ChannelEntry {
|
|||
channelId: number;
|
||||
parent?: ChannelEntry;
|
||||
properties: ChannelProperties = new ChannelProperties();
|
||||
originalHeight: number;
|
||||
|
||||
channel_previous?: ChannelEntry;
|
||||
channel_next?: ChannelEntry;
|
||||
|
||||
private _channelAlign: string;
|
||||
private _formatedChannelName: string;
|
||||
private _channel_name_alignment: string = undefined;
|
||||
private _channel_name_formatted: string = undefined;
|
||||
private _family_index: number = 0;
|
||||
|
||||
//HTML DOM elements
|
||||
private _tag_root: JQuery<HTMLElement>;
|
||||
private _tag_siblings: JQuery<HTMLElement>;
|
||||
private _tag_clients: JQuery<HTMLElement>;
|
||||
private _tag_channel: JQuery<HTMLElement>;
|
||||
private _tag_root: JQuery<HTMLElement>; /* container for the channel, client and children tag */
|
||||
private _tag_siblings: JQuery<HTMLElement>; /* container for all sub channels */
|
||||
private _tag_clients: JQuery<HTMLElement>; /* container for all clients */
|
||||
private _tag_channel: JQuery<HTMLElement>; /* container for the channel info itself */
|
||||
|
||||
private _cachedPassword: string;
|
||||
private _cached_channel_description: string = undefined;
|
||||
|
|
@ -75,7 +74,7 @@ class ChannelEntry {
|
|||
constructor(channelId, channelName, parent = null) {
|
||||
this.properties = new ChannelProperties();
|
||||
this.channelId = channelId;
|
||||
this._formatedChannelName = channelName;
|
||||
this.properties.channel_name = channelName;
|
||||
this.parent = parent;
|
||||
this.channelTree = null;
|
||||
|
||||
|
|
@ -87,8 +86,8 @@ class ChannelEntry {
|
|||
return this.properties.channel_name;
|
||||
}
|
||||
|
||||
formatedChannelName() {
|
||||
return this._formatedChannelName !== undefined ? this._formatedChannelName : this.properties.channel_name;
|
||||
formattedChannelName() {
|
||||
return this._channel_name_formatted || this.properties.channel_name;
|
||||
}
|
||||
|
||||
getChannelDescription() : Promise<string> {
|
||||
|
|
@ -105,12 +104,11 @@ class ChannelEntry {
|
|||
});
|
||||
}
|
||||
|
||||
parent_channel?() { return this.parent; }
|
||||
parent_channel() { return this.parent; }
|
||||
hasParent(){ return this.parent != null; }
|
||||
getChannelId(){ return this.channelId; }
|
||||
channelClass() { return "channel_full"; }
|
||||
|
||||
siblings(deep = false) : ChannelEntry[] {
|
||||
children(deep = false) : ChannelEntry[] {
|
||||
const result: ChannelEntry[] = [];
|
||||
if(this.channelTree == null) return [];
|
||||
|
||||
|
|
@ -141,7 +139,7 @@ class ChannelEntry {
|
|||
let current = entry.currentChannel();
|
||||
if(deep) {
|
||||
while(current) {
|
||||
if(current.parent_channel() == self) {
|
||||
if(current == self) {
|
||||
result.push(entry);
|
||||
break;
|
||||
}
|
||||
|
|
@ -173,54 +171,140 @@ class ChannelEntry {
|
|||
return clients;
|
||||
}
|
||||
|
||||
update_family_index(enforce?: boolean) {
|
||||
const current_index = this._family_index;
|
||||
const new_index = this.calculate_family_index(true);
|
||||
if(current_index == new_index && !enforce) return;
|
||||
|
||||
this._tag_channel.css("z-index", this._family_index);
|
||||
this._tag_channel.css("padding-left", (this._family_index + 1) * 16 + "px");
|
||||
}
|
||||
|
||||
calculate_family_index(enforce_recalculate: boolean = false) : number {
|
||||
if(this._family_index !== undefined && !enforce_recalculate)
|
||||
return this._family_index;
|
||||
|
||||
this._family_index = 0;
|
||||
|
||||
let channel = this.parent_channel();
|
||||
while(channel) {
|
||||
this._family_index++;
|
||||
channel = channel.parent_channel();
|
||||
}
|
||||
|
||||
return this._family_index;
|
||||
}
|
||||
|
||||
private initializeTag() {
|
||||
let rootTag = $.spawn("div");
|
||||
const tag_channel = $.spawn("div").addClass("tree-entry channel");
|
||||
|
||||
rootTag.attr("id", "channel_" + this.getChannelId());
|
||||
rootTag.addClass("channel");
|
||||
//rootTag.append($.spawn("div").addClass("icon_empty"));
|
||||
{
|
||||
const container_entry = $.spawn("div").addClass("container-channel");
|
||||
|
||||
//Tag channel
|
||||
this._tag_channel = $.spawn("div");
|
||||
this._tag_channel.attr('channel-id', this.channelId);
|
||||
this._tag_channel.addClass("channelLine");
|
||||
this._tag_channel.addClass(this._channelAlign); //For left
|
||||
this._tag_channel.css('z-index', this._family_index);
|
||||
container_entry.attr("channel-id", this.channelId);
|
||||
container_entry.addClass(this._channel_name_alignment);
|
||||
|
||||
let channelType = $.spawn("div");
|
||||
channelType.addClass("channel_only_normal channel_type icon client-channel_green_subscribed");
|
||||
this._tag_channel.append(channelType);
|
||||
/* channel icon (type) */
|
||||
{
|
||||
container_entry.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only channel-type icon client-channel_green_subscribed")
|
||||
);
|
||||
}
|
||||
|
||||
this._tag_channel.append($.spawn("div").addClass("channel_name_container").append($.spawn("a").addClass("channel_name").text(this.channelName())));
|
||||
/* channel name */
|
||||
{
|
||||
container_entry.append(
|
||||
$.spawn("div")
|
||||
.addClass("container-channel-name")
|
||||
.append(
|
||||
$.spawn("a")
|
||||
.addClass("channel-name")
|
||||
.text(this.channelName())
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
//Icons
|
||||
let iconTag = $.spawn("span").addClass("icons");
|
||||
iconTag.appendTo(this._tag_channel);
|
||||
/* all icons (last element) */
|
||||
{
|
||||
//Icons
|
||||
let container_icons = $.spawn("span").addClass("icons");
|
||||
|
||||
//Default icon (5)
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only icon_entry icon_default icon client-channel_default")
|
||||
.attr("title", tr("Default channel"))
|
||||
);
|
||||
|
||||
//Password icon (4)
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only icon_entry icon_password icon client-register")
|
||||
.attr("title", tr("The channel is password protected"))
|
||||
);
|
||||
|
||||
//Music icon (3)
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only icon_entry icon_music icon client-music")
|
||||
.attr("title", tr("Music quality"))
|
||||
);
|
||||
|
||||
//Channel moderated (2)
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only icon_entry icon_moderated icon client-moderated")
|
||||
.attr("title", tr("Channel is moderated"))
|
||||
);
|
||||
|
||||
//Channel Icon (1)
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("show-channel-normal-only icon_entry channel_icon")
|
||||
.attr("title", tr("Channel icon"))
|
||||
);
|
||||
|
||||
//Default no sound (0)
|
||||
let container = $.spawn("div")
|
||||
.css("position", "relative")
|
||||
.addClass("icon_no_sound");
|
||||
|
||||
let noSound = $.spawn("div")
|
||||
.addClass("icon_entry icon client-conflict-icon")
|
||||
.attr("title", "You don't support the channel codec");
|
||||
|
||||
let bg = $.spawn("div")
|
||||
.width(10)
|
||||
.height(14)
|
||||
.css("background", "red")
|
||||
.css("position", "absolute")
|
||||
.css("top", "1px")
|
||||
.css("left", "3px")
|
||||
.css("z-index", "-1");
|
||||
bg.appendTo(container);
|
||||
noSound.appendTo(container);
|
||||
container_icons.append(container);
|
||||
|
||||
container_icons.appendTo(container_entry);
|
||||
}
|
||||
|
||||
tag_channel.append(this._tag_channel = container_entry);
|
||||
this.update_family_index(true);
|
||||
}
|
||||
{
|
||||
const container_client = $.spawn("div").addClass("container-clients");
|
||||
|
||||
|
||||
tag_channel.append(this._tag_clients = container_client);
|
||||
}
|
||||
{
|
||||
const container_children = $.spawn("div").addClass("container-children");
|
||||
|
||||
|
||||
tag_channel.append(this._tag_siblings = container_children);
|
||||
}
|
||||
|
||||
//Default icon (5)
|
||||
iconTag.append($.spawn("div").addClass("channel_only_normal").append($.spawn("div").addClass("icon_entry icon_default icon client-channel_default").attr("title", "Default channel")));
|
||||
//Password icon (4)
|
||||
iconTag.append($.spawn("div").addClass("channel_only_normal").append($.spawn("div").addClass("icon_entry icon_password icon client-register").attr("title", "The channel is password protected")));
|
||||
//Music icon (3)
|
||||
iconTag.append($.spawn("div").addClass("channel_only_normal").append($.spawn("div").addClass("icon_entry icon_music icon client-music").attr("title", "Music quality")));
|
||||
//Channel moderated (2)
|
||||
iconTag.append($.spawn("div").addClass("channel_only_normal").append($.spawn("div").addClass("icon_entry icon_moderated icon client-moderated").attr("title", "Channel is moderated")));
|
||||
//Channel Icon (1)
|
||||
//iconTag.append($.spawn("div").addClass("channel_only_normal").addClass("icon_entry channel_icon").attr("title", "Channel icon"));
|
||||
iconTag.append($.spawn("div").addClass("channel_only_normal").append($.spawn("div").addClass("icon_entry channel_icon").attr("title", "Channel icon")));
|
||||
//Default no sound (0)
|
||||
let container = $.spawn("div");
|
||||
let noSound = $.spawn("div").addClass("icon_entry icon_no_sound icon client-conflict-icon").attr("title", "You don't support the channel codec");
|
||||
let bg = $.spawn("div")
|
||||
.width(10)
|
||||
.height(14)
|
||||
.css("background", "red")
|
||||
.css("position", "absolute")
|
||||
.css("top", "1px")
|
||||
.css("left", "3px");
|
||||
bg.appendTo(container);
|
||||
noSound.appendTo(container);
|
||||
iconTag.append(container);
|
||||
/*
|
||||
setInterval(() => {
|
||||
let color = (Math.random() * 10000000).toString(16).substr(0, 6);
|
||||
|
|
@ -228,20 +312,7 @@ class ChannelEntry {
|
|||
}, 150);
|
||||
*/
|
||||
|
||||
//Build siblings
|
||||
this._tag_siblings = $.spawn("div").addClass("siblings");
|
||||
let tag_siblings_box = $.spawn("div").css("position", "absolute").css("width", "calc(100% - 16px)").css("margin", "0px");
|
||||
this._tag_siblings.appendTo(tag_siblings_box);
|
||||
|
||||
//Build clients
|
||||
this._tag_clients = $.spawn("div").addClass("clients");
|
||||
let tag_clients_box = $.spawn("div").css("position", "absolute").css("width", "calc(100% - 16px)").css("margin", "0px");
|
||||
this._tag_clients.appendTo(tag_clients_box);
|
||||
|
||||
this._tag_root = rootTag;
|
||||
tag_clients_box.appendTo(this._tag_root);
|
||||
tag_siblings_box.appendTo(this._tag_root);
|
||||
this._tag_channel.appendTo(this._tag_root);
|
||||
this._tag_root = tag_channel;
|
||||
}
|
||||
|
||||
rootTag() : JQuery<HTMLElement> {
|
||||
|
|
@ -287,29 +358,6 @@ class ChannelEntry {
|
|||
}
|
||||
}
|
||||
|
||||
adjustSize(parent = true) {
|
||||
const size = this.originalHeight;
|
||||
let subSize = 0;
|
||||
let clientSize = 0;
|
||||
|
||||
const sub = this.siblings(false);
|
||||
sub.forEach(function (e) {
|
||||
if(e.rootTag().is(":visible"))
|
||||
subSize += e.rootTag().outerHeight(true);
|
||||
});
|
||||
|
||||
const clients = this.clients(false);
|
||||
clients.forEach(function (e) {
|
||||
if(e.tag.is(":visible"))
|
||||
clientSize += e.tag.outerHeight(true);
|
||||
});
|
||||
|
||||
this._tag_root.css({height: size + subSize + clientSize});
|
||||
this._tag_siblings.css("margin-top", (clientSize + 16) + "px");
|
||||
this._tag_clients.css({height: clientSize});
|
||||
if(parent && this.parent_channel()) this.parent_channel().adjustSize(parent);
|
||||
}
|
||||
|
||||
initializeListener() {
|
||||
const _this = this;
|
||||
this.channelTag().click(function () {
|
||||
|
|
@ -465,8 +513,10 @@ class ChannelEntry {
|
|||
this.__updateChannelName();
|
||||
}
|
||||
|
||||
private static NAME_ALIGNMENTS: string[] = ["align-left", "align-center", "align-right", "align-repetitive"];
|
||||
private __updateChannelName() {
|
||||
this._formatedChannelName = undefined;
|
||||
this._channel_name_formatted = undefined;
|
||||
|
||||
parseType:
|
||||
if(this.parent_channel() == null && this.properties.channel_name.charAt(0) == '[') {
|
||||
let end = this.properties.channel_name.indexOf(']');
|
||||
|
|
@ -477,49 +527,76 @@ class ChannelEntry {
|
|||
options = options.substr(0, options.indexOf("spacer"));
|
||||
|
||||
console.log(tr("Channel options: '%o'"), options);
|
||||
if(options.length == 0) options = "l";
|
||||
if(options.length == 0) options = "align-left";
|
||||
else if(options.length > 1) options = options[0];
|
||||
|
||||
if(options == "r" || options == "l" || options == "c" || options == "*")
|
||||
this._channelAlign = options;
|
||||
else break parseType;
|
||||
switch (options) {
|
||||
case "r":
|
||||
this._channel_name_alignment = "align-right";
|
||||
break;
|
||||
case "l":
|
||||
this._channel_name_alignment = "align-left";
|
||||
break;
|
||||
case "c":
|
||||
this._channel_name_alignment = "align-center";
|
||||
break;
|
||||
case "*":
|
||||
this._channel_name_alignment = "align-repetitive";
|
||||
break;
|
||||
default:
|
||||
this._channel_name_alignment = undefined;
|
||||
break parseType;
|
||||
}
|
||||
|
||||
this._formatedChannelName = this.properties.channel_name.substr(end + 1);
|
||||
console.log(tr("Got channel name: %o"), this._formatedChannelName);
|
||||
this._channel_name_formatted = this.properties.channel_name.substr(end + 1);
|
||||
console.log(tr("Got formated channel name: %o"), this._channel_name_formatted);
|
||||
}
|
||||
|
||||
let self = this.channelTag();
|
||||
let channelName = self.find(".channel_name");
|
||||
channelName.text(this.formatedChannelName());
|
||||
channelName.parent().removeClass("l r c *"); //Alignments
|
||||
(this._formatedChannelName !== undefined ? $.fn.hide : $.fn.show).apply(self.find(".channel_only_normal"));
|
||||
this._tag_channel.find(".show-channel-normal-only").toggleClass("channel-normal", this._channel_name_formatted === undefined);
|
||||
|
||||
if(this._formatedChannelName !== undefined) {
|
||||
channelName.parent().addClass(this._channelAlign);
|
||||
const tag_container_name = this._tag_channel.find(".container-channel-name");
|
||||
tag_container_name.removeClass(ChannelEntry.NAME_ALIGNMENTS.join(" "));
|
||||
|
||||
if(this._channelAlign == "*") {
|
||||
let lastSuccess = "";
|
||||
let index = 6;
|
||||
const tag_name = tag_container_name.find(".channel-name");
|
||||
tag_name.text(this._channel_name_formatted || this.properties.channel_name);
|
||||
|
||||
let name = this.formatedChannelName();
|
||||
while(index-- > 0)
|
||||
name = name + name;
|
||||
channelName.text(name);
|
||||
do {
|
||||
channelName.text(name = name + name);
|
||||
} while (channelName.parent().width() >= channelName.width() && ++index < 64);
|
||||
if(index == 64) console.warn(LogCategory.CHANNEL, tr("Repeating spacer took too much repeats!"));
|
||||
if(lastSuccess.length > 0) {
|
||||
channelName.text(lastSuccess);
|
||||
self.addClass("c");
|
||||
if(this._channel_name_formatted !== undefined) {
|
||||
tag_container_name.addClass(this._channel_name_alignment);
|
||||
|
||||
if(this._channel_name_alignment == "align-repetitive") {
|
||||
if(tag_name.parent().width() != 0) {
|
||||
let lastSuccess = "";
|
||||
let index = 6;
|
||||
|
||||
let name = this._channel_name_formatted;
|
||||
if(name.length < 1) throw "invalid name!";
|
||||
|
||||
while(index-- > 0)
|
||||
name = name + name;
|
||||
tag_name.text(name);
|
||||
do {
|
||||
tag_name.text(name = name + name);
|
||||
if(name.length > 1024 * 8)
|
||||
index = 63;
|
||||
} while (tag_name.parent().width() >= tag_name.width() && ++index < 64);
|
||||
if(index == 64)
|
||||
console.warn(LogCategory.CHANNEL, tr("Repeating spacer took too much repeats!"));
|
||||
if(lastSuccess.length > 0) {
|
||||
tag_name.text(lastSuccess);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
console.log(tr("Align: %s"), this._channelAlign);
|
||||
console.log(tr("Align: %s"), this._channel_name_alignment);
|
||||
}
|
||||
|
||||
recalculate_repetitive_name() {
|
||||
if(this._channel_name_alignment == "align-repetitive")
|
||||
this.__updateChannelName();
|
||||
}
|
||||
|
||||
updateVariables(...variables: {key: string, value: string}[]) {
|
||||
let group = log.group(log.LogType.DEBUG, LogCategory.CHANNEL, tr("Update properties (%i) of %s (%i)"), variables.length, this.channelName(), this.getChannelId());
|
||||
let group = log.group(log.LogType.DEBUG, LogCategory.CHANNEL_PROPERTIES, tr("Update properties (%i) of %s (%i)"), variables.length, this.channelName(), this.getChannelId());
|
||||
|
||||
for(let variable of variables) {
|
||||
let key = variable.key;
|
||||
|
|
@ -564,9 +641,11 @@ class ChannelEntry {
|
|||
}
|
||||
|
||||
updateChannelTypeIcon() {
|
||||
let tag = this.channelTag().find(".channel_type");
|
||||
let tag = this.channelTag().find(".channel-type");
|
||||
tag.removeAttr('class');
|
||||
tag.addClass("channel_only_normal channel_type icon");
|
||||
tag.addClass("show-channel-normal-only channel-type icon");
|
||||
if(this._channel_name_formatted === undefined)
|
||||
tag.addClass("channel-normal");
|
||||
|
||||
let type;
|
||||
if(this.properties.channel_flag_password == true && !this._cachedPassword)
|
||||
|
|
@ -583,7 +662,7 @@ class ChannelEntry {
|
|||
}
|
||||
|
||||
generate_bbcode() {
|
||||
return "[url=channel://" + this.channelId + "/" + encodeURIComponent(this.properties.channel_name) + "]" + this.formatedChannelName() + "[/url]";
|
||||
return "[url=channel://" + this.channelId + "/" + encodeURIComponent(this.properties.channel_name) + "]" + this.formattedChannelName() + "[/url]";
|
||||
}
|
||||
|
||||
generate_tag(braces: boolean = false) : JQuery {
|
||||
|
|
|
|||
|
|
@ -416,26 +416,58 @@ class ClientEntry {
|
|||
get tag() : JQuery<HTMLElement> {
|
||||
if(this._tag) return this._tag;
|
||||
|
||||
let tag = $.spawn("div");
|
||||
let container_client = $.spawn("div")
|
||||
.addClass("tree-entry client")
|
||||
.attr("client-id", this.clientId());
|
||||
|
||||
tag.attr("id", "client_" + this.clientId());
|
||||
tag.addClass("client");
|
||||
tag.append($.spawn("div").addClass("icon_empty"));
|
||||
|
||||
tag.append($.spawn("div").addClass("icon_client_state").attr("title", "Client state"));
|
||||
container_client.append(
|
||||
$.spawn("div")
|
||||
.addClass("icon_client_state")
|
||||
.attr("title", "Client state")
|
||||
);
|
||||
|
||||
tag.append($.spawn("div").addClass("group_prefix").attr("title", "Server groups prefixes").hide());
|
||||
tag.append($.spawn("div").addClass("name").text(this.clientNickName()));
|
||||
tag.append($.spawn("div").addClass("group_suffix").attr("title", "Server groups suffix").hide());
|
||||
tag.append($.spawn("div").addClass("away").text(this.clientNickName()));
|
||||
container_client.append(
|
||||
$.spawn("div")
|
||||
.addClass("group-prefix")
|
||||
.attr("title", "Server groups prefixes")
|
||||
.hide()
|
||||
);
|
||||
container_client.append(
|
||||
$.spawn("div")
|
||||
.addClass("client-name")
|
||||
.text(this.clientNickName())
|
||||
);
|
||||
container_client.append(
|
||||
$.spawn("div")
|
||||
.addClass("group-suffix")
|
||||
.attr("title", "Server groups suffix")
|
||||
.hide()
|
||||
);
|
||||
container_client.append(
|
||||
$.spawn("div")
|
||||
.addClass("client-away-message")
|
||||
.text(this.clientNickName())
|
||||
);
|
||||
|
||||
let clientIcons = $.spawn("span");
|
||||
clientIcons.append($.spawn("div").addClass("icon icon_talk_power client-input_muted").hide());
|
||||
clientIcons.append($.spawn("span").addClass("group_icons"));
|
||||
clientIcons.append($.spawn("span").addClass("client_icon"));
|
||||
tag.append(clientIcons);
|
||||
let container_icons = $.spawn("div").addClass("container-icons");
|
||||
|
||||
this._tag = tag;
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("icon icon_talk_power client-input_muted")
|
||||
.hide()
|
||||
);
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("container-icons-group")
|
||||
);
|
||||
container_icons.append(
|
||||
$.spawn("div")
|
||||
.addClass("container-icon-client")
|
||||
);
|
||||
container_client.append(container_icons);
|
||||
|
||||
this._tag = container_client;
|
||||
this.initializeListener();
|
||||
return this._tag;
|
||||
}
|
||||
|
|
@ -470,9 +502,9 @@ class ClientEntry {
|
|||
updateClientStatusIcons() {
|
||||
let talk_power = this.properties.client_talk_power >= this._channel.properties.channel_needed_talk_power;
|
||||
if(talk_power)
|
||||
this.tag.find("span").find(".icon_talk_power").hide();
|
||||
this.tag.find(".icon_talk_power").hide();
|
||||
else
|
||||
this.tag.find("span").find(".icon_talk_power").show();
|
||||
this.tag.find(".icon_talk_power").show();
|
||||
}
|
||||
|
||||
updateClientSpeakIcon() {
|
||||
|
|
@ -519,7 +551,7 @@ class ClientEntry {
|
|||
}
|
||||
|
||||
updateAwayMessage() {
|
||||
let tag = this.tag.find(".away");
|
||||
let tag = this.tag.find(".client-away-message");
|
||||
if(this.properties.client_away == true && this.properties.client_away_message){
|
||||
tag.text("[" + this.properties.client_away_message + "]");
|
||||
tag.show();
|
||||
|
|
@ -542,7 +574,7 @@ class ClientEntry {
|
|||
//TODO tr
|
||||
group.log("Updating client " + this.clientId() + ". Key " + variable.key + " Value: '" + variable.value + "' (" + typeof (this.properties[variable.key]) + ")");
|
||||
if(variable.key == "client_nickname") {
|
||||
this.tag.find(".name").text(variable.value);
|
||||
this.tag.find(".client-name").text(variable.value);
|
||||
let chat = this.chat(false);
|
||||
if(chat) chat.name = variable.value;
|
||||
|
||||
|
|
@ -584,7 +616,7 @@ class ClientEntry {
|
|||
}
|
||||
|
||||
update_displayed_client_groups() {
|
||||
this.tag.find("span .group_icons").children().detach();
|
||||
this.tag.find(".container-icons-group").children().detach();
|
||||
|
||||
for(let id of this.assignedServerGroupIds())
|
||||
this.updateGroupIcon(this.channelTree.client.groups.serverGroup(id));
|
||||
|
|
@ -603,8 +635,8 @@ class ClientEntry {
|
|||
suffix_groups.push(group.name);
|
||||
}
|
||||
|
||||
const tag_group_prefix = this.tag.find(".group_prefix");
|
||||
const tag_group_suffix = this.tag.find(".group_suffix");
|
||||
const tag_group_prefix = this.tag.find(".group-prefix");
|
||||
const tag_group_suffix = this.tag.find(".group-suffix");
|
||||
if(prefix_groups.length > 0) {
|
||||
tag_group_prefix.text("[" + prefix_groups.join("][") + "]").show();
|
||||
} else {
|
||||
|
|
@ -648,21 +680,23 @@ class ClientEntry {
|
|||
}
|
||||
|
||||
updateClientIcon() {
|
||||
this.tag.find("span .client_icon").children().detach();
|
||||
this.tag.find(".container-icon-client").children().detach();
|
||||
if(this.properties.client_icon_id > 0) {
|
||||
this.channelTree.client.fileManager.icons.generateTag(this.properties.client_icon_id).attr("title", "Client icon")
|
||||
.appendTo(this.tag.find("span .client_icon"));
|
||||
.appendTo(this.tag.find(".container-icon-client"));
|
||||
}
|
||||
}
|
||||
|
||||
updateGroupIcon(group: Group) {
|
||||
if(!group) return;
|
||||
//TODO group icon order
|
||||
this.tag.find(".group_icons .icon_group_" + group.id).detach();
|
||||
this.tag.find(".container-icons-group .icon_group_" + group.id).detach();
|
||||
|
||||
if (group.properties.iconid > 0) {
|
||||
this.tag.find("span .group_icons").append(
|
||||
$.spawn("div").addClass("icon_group_" + group.id).append(this.channelTree.client.fileManager.icons.generateTag(group.properties.iconid)).attr("title", group.name)
|
||||
this.tag.find(".container-icons-group").append(
|
||||
$.spawn("div")
|
||||
.addClass("container-group-icon icon_group_" + group.id)
|
||||
.append(this.channelTree.client.fileManager.icons.generateTag(group.properties.iconid)).attr("title", group.name)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -728,6 +762,13 @@ class ClientEntry {
|
|||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
update_family_index() {
|
||||
if(!this._channel) return;
|
||||
const index = this._channel.calculate_family_index();
|
||||
|
||||
this.tag.css('padding-left', (index + 2) * 16 + "px");
|
||||
}
|
||||
}
|
||||
|
||||
class LocalClientEntry extends ClientEntry {
|
||||
|
|
@ -774,7 +815,7 @@ class LocalClientEntry extends ClientEntry {
|
|||
|
||||
initializeListener(): void {
|
||||
super.initializeListener();
|
||||
this.tag.find(".name").addClass("own_name");
|
||||
this.tag.find(".client-name").addClass("client-name-own");
|
||||
|
||||
this.tag.dblclick(() => {
|
||||
if($.isArray(this.channelTree.currently_selected)) { //Multiselect
|
||||
|
|
@ -787,9 +828,9 @@ class LocalClientEntry extends ClientEntry {
|
|||
openRename() : void {
|
||||
const _self = this;
|
||||
|
||||
const elm = this.tag.find(".name");
|
||||
const elm = this.tag.find(".client-name");
|
||||
elm.attr("contenteditable", "true");
|
||||
elm.removeClass("own_name");
|
||||
elm.removeClass("client-name-own");
|
||||
elm.css("background-color", "white");
|
||||
elm.focus();
|
||||
_self.renaming = true;
|
||||
|
|
@ -807,7 +848,7 @@ class LocalClientEntry extends ClientEntry {
|
|||
|
||||
elm.css("background-color", "");
|
||||
elm.removeAttr("contenteditable");
|
||||
elm.addClass("own_name");
|
||||
elm.addClass("client-name-own");
|
||||
let text = elm.text().toString();
|
||||
if(_self.clientNickName() == text) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ class ClientMover {
|
|||
|
||||
const elements = document.elementsFromPoint(event.pageX, event.pageY);
|
||||
while(elements.length > 0) {
|
||||
if(elements[0].classList.contains("channelLine")) break;
|
||||
if(elements[0].classList.contains("container-channel")) break;
|
||||
elements.pop_front();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,12 +21,13 @@ if(!$.fn.dividerfy) {
|
|||
next_element.css(property, "calc(" +next + "% - " + (vertical ? element.width() : element.height()) + "px)");
|
||||
};
|
||||
|
||||
const listener_move = (event: MouseEvent) => {
|
||||
|
||||
const listener_move = (event: MouseEvent | TouchEvent) => {
|
||||
const parent_offset = parent_element.offset();
|
||||
const min = vertical ? parent_offset.left : parent_offset.top;
|
||||
const max = vertical ? parent_offset.left + parent_element.width() : parent_offset.top + parent_element.height();
|
||||
const current = vertical ? event.pageX : event.pageY;
|
||||
const current = event instanceof MouseEvent ?
|
||||
(vertical ? event.pageX : event.pageY) :
|
||||
(vertical ? event.touches[event.touches.length - 1].clientX : event.touches[event.touches.length - 1].clientY);
|
||||
|
||||
/*
|
||||
const previous_offset = previous_element.offset();
|
||||
|
|
@ -70,14 +71,30 @@ if(!$.fn.dividerfy) {
|
|||
|
||||
const listener_up = (event: MouseEvent) => {
|
||||
document.removeEventListener('mousemove', listener_move);
|
||||
document.removeEventListener('touchmove', listener_move);
|
||||
|
||||
document.removeEventListener('mouseup', listener_up);
|
||||
document.removeEventListener('touchend', listener_up);
|
||||
document.removeEventListener('touchcancel', listener_up);
|
||||
$(document.documentElement).css("user-select", "");
|
||||
|
||||
element.removeClass("seperator-selected");
|
||||
};
|
||||
|
||||
element.on('mousedown', () => {
|
||||
document.addEventListener('mousemove', listener_move);
|
||||
document.addEventListener('touchmove', listener_move);
|
||||
|
||||
document.addEventListener('mouseup', listener_up);
|
||||
document.addEventListener('touchend', listener_up);
|
||||
document.addEventListener('touchcancel', listener_up);
|
||||
$(document.documentElement).css("user-select", "none");
|
||||
|
||||
element.addClass("seperator-selected");
|
||||
});
|
||||
|
||||
element.on('touchstart', () => {
|
||||
element.trigger('mousedown');
|
||||
});
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -96,9 +96,9 @@ class ControlBar {
|
|||
}
|
||||
|
||||
//Need an initialise
|
||||
this.muteInput = settings.global("mute_input") == "1";
|
||||
this.muteOutput = settings.global("mute_output") == "1";
|
||||
this.query_visibility = settings.global("show_server_queries") == "1";
|
||||
this.muteInput = settings.static_global("mute_input", false);
|
||||
this.muteOutput = settings.static_global("mute_output", false);
|
||||
this.query_visible = settings.static_global("show_server_queries", false);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -243,6 +243,7 @@ class ControlBar {
|
|||
}
|
||||
|
||||
private onConnect() {
|
||||
this.handle.cancel_reconnect();
|
||||
Modals.spawnConnectModal({
|
||||
url: "ts.TeaSpeak.de",
|
||||
enforce: false
|
||||
|
|
@ -264,6 +265,7 @@ class ControlBar {
|
|||
}
|
||||
|
||||
private onDisconnect() {
|
||||
this.handle.cancel_reconnect();
|
||||
this.handle.handleDisconnect(DisconnectReason.REQUESTED); //TODO message?
|
||||
this.update_connection_state();
|
||||
sound.play(Sound.CONNECTION_DISCONNECTED);
|
||||
|
|
@ -412,21 +414,22 @@ class ControlBar {
|
|||
Modals.spawnBookmarkModal();
|
||||
}
|
||||
|
||||
get query_visibility() {
|
||||
get query_visible() {
|
||||
return this._query_visible;
|
||||
}
|
||||
|
||||
set query_visibility(flag: boolean) {
|
||||
set query_visible(flag: boolean) {
|
||||
console.error(flag);
|
||||
if(this._query_visible == flag) return;
|
||||
|
||||
this._query_visible = flag;
|
||||
settings.global("show_server_queries", flag);
|
||||
settings.changeGlobal("show_server_queries", flag);
|
||||
this.update_query_visibility_button();
|
||||
this.handle.channelTree.toggle_server_queries(flag);
|
||||
}
|
||||
|
||||
private on_query_visibility_toggle() {
|
||||
this.query_visibility = !this._query_visible;
|
||||
this.query_visible = !this._query_visible;
|
||||
this.update_query_visibility_button();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -160,6 +160,13 @@ class Hostbanner {
|
|||
properties["property_" + key] = server.properties[key];
|
||||
|
||||
const rendered = $("#tmpl_selected_hostbanner").renderTag(properties);
|
||||
|
||||
console.debug(tr("Hostbanner has been loaded"));
|
||||
if(server.properties.virtualserver_hostbanner_gfx_interval > 0)
|
||||
this.updater = setTimeout(() => this.update(), Math.min(server.properties.virtualserver_hostbanner_gfx_interval, 60) * 1000);
|
||||
|
||||
return Promise.resolve(rendered);
|
||||
/*
|
||||
const image = rendered.find("img");
|
||||
return new Promise<JQuery<HTMLElement>>((resolve, reject) => {
|
||||
const node_image = image[0] as HTMLImageElement;
|
||||
|
|
@ -173,6 +180,7 @@ class Hostbanner {
|
|||
reject(event);
|
||||
}
|
||||
});
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -208,6 +216,7 @@ class ClientInfoManager extends InfoManager<ClientEntry> {
|
|||
properties["client_name"] = client.createChatTag()[0];
|
||||
properties["client_onlinetime"] = formatDate(client.calculateOnlineTime());
|
||||
properties["sound_volume"] = client.audioController.volume * 100;
|
||||
properties["client_is_query"] = client.properties.client_type == ClientType.CLIENT_QUERY;
|
||||
|
||||
properties["group_server"] = [];
|
||||
for(let groupId of client.assignedServerGroupIds()) {
|
||||
|
|
@ -511,7 +520,6 @@ class MusicInfoManager extends ClientInfoManager {
|
|||
}).catch(error => {
|
||||
createErrorModal(tr("Failed to query playlist."), tr("Failed to query playlist info.")).open();
|
||||
});
|
||||
createErrorModal(tr("Not implemented"), tr("This function is not implemented yet!")).open();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ namespace Modals {
|
|||
header: base && base.banid > 0 ? tr("Edit ban") : tr("Add ban"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_ban_create").renderTag();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
const input_name = template.find(".input-name");
|
||||
const input_name_type = template.find(".input-name-type");
|
||||
|
|
|
|||
|
|
@ -180,10 +180,9 @@ namespace Modals {
|
|||
header: tr("Banlist"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_ban_list").renderTag();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
apply_filter(template.find(".entry-filter"), template.find(".filter-flag-force-own"), template.find(".filter-flag-highlight-own"), template.find(".ban-entry-list"));
|
||||
update_function = apply_buttons(template.find(".manage-buttons"), template.find(".ban-entry-list"), callback_add, _callback_edit, _callback_delete);
|
||||
update_function = apply_buttons(template.find(".manage-buttons"), template.find(".entry-container .entries"), callback_add, _callback_edit, _callback_delete);
|
||||
template.find(".button-close").on('click', _ => modal.close());
|
||||
template.find(".button-refresh").on('click', () => callback_update());
|
||||
return template;
|
||||
|
|
@ -195,17 +194,18 @@ namespace Modals {
|
|||
modal.open();
|
||||
modal.close_listener.push(() => entries = []);
|
||||
|
||||
const template_entry = $("#tmpl_ban_entry");
|
||||
result.addbans = (bans: BanEntry[]) => {
|
||||
for(const entry of bans) {
|
||||
entries.push(entry);
|
||||
$("#tmpl_ban_entry").renderTag(entry).appendTo(modal.htmlTag.find(".ban-entry-list"));
|
||||
template_entry.renderTag(entry).appendTo(modal.htmlTag.find(".entry-container .entries"));
|
||||
}
|
||||
modal.htmlTag.find(".entry-filter").trigger("change");
|
||||
update_function();
|
||||
};
|
||||
result.clear = () => {
|
||||
entries = [];
|
||||
modal.htmlTag.find(".ban-entry-list").children().detach();
|
||||
modal.htmlTag.find(".entry-container .entries").children().detach();
|
||||
update_function();
|
||||
};
|
||||
|
||||
|
|
@ -253,24 +253,24 @@ namespace Modals {
|
|||
|
||||
function apply_buttons(tag: JQuery, elements: JQuery, cb_add: () => any, cb_edit: (id: number) => any, cb_delete: (id: number) => any) : () => any {
|
||||
const update = () => {
|
||||
console.log(elements.find("tr.selected").length);
|
||||
$(".button-edit, .button-remove").prop("disabled", elements.find("tr.selected").length == 0);
|
||||
console.log(elements.find(".ban-entry.selected").length);
|
||||
$(".button-edit, .button-remove").prop("disabled", elements.find(".ban-entry.selected").length == 0);
|
||||
};
|
||||
|
||||
tag.find(".button-add").on('click', event => cb_add());
|
||||
tag.find(".button-edit").on('click', event => {
|
||||
const selected = elements.find("tr.selected");
|
||||
const selected = elements.find(".ban-entry.selected");
|
||||
if(!selected) return;
|
||||
cb_edit(parseInt(selected.attr("ban-id")));
|
||||
});
|
||||
tag.find(".button-remove").on('click', event => {
|
||||
const selected = elements.find("tr.selected");
|
||||
const selected = elements.find(".ban-entry.selected");
|
||||
if(!selected) return;
|
||||
cb_delete(parseInt(selected.attr("ban-id")));
|
||||
});
|
||||
|
||||
const element_selected = element => {
|
||||
elements.find("tr").removeClass("selected");
|
||||
elements.find(".ban-entry").removeClass("selected");
|
||||
if(element.is(":visible"))
|
||||
element.addClass("selected");
|
||||
|
||||
|
|
@ -296,7 +296,7 @@ namespace Modals {
|
|||
};
|
||||
|
||||
return () => {
|
||||
elements.find("tr").each((_idx, _entry) => {
|
||||
elements.find(".ban-entry").each((_idx, _entry) => {
|
||||
_entry.addEventListener("click", click_handler);
|
||||
_entry.addEventListener("contextmenu", context_handler)
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,102 +3,123 @@
|
|||
namespace Modals {
|
||||
export function spawnConnectModal(defaultHost: { url: string, enforce: boolean} = { url: "ts.TeaSpeak.de", enforce: false}, connect_profile?: { profile: profiles.ConnectionProfile, enforce: boolean}) {
|
||||
let selected_profile: profiles.ConnectionProfile;
|
||||
const connectModal = createModal({
|
||||
header: function() {
|
||||
let header = $.spawn("div");
|
||||
header.text(tr("Create a new connection"));
|
||||
return header;
|
||||
},
|
||||
body: function () {
|
||||
let tag = $("#tmpl_connect").renderTag({
|
||||
client: native_client,
|
||||
forum_path: settings.static("forum_path")
|
||||
|
||||
const random_id = (() => {
|
||||
const array = new Uint32Array(10);
|
||||
window.crypto.getRandomValues(array);
|
||||
return array.join("");
|
||||
})();
|
||||
|
||||
const connect_modal = $("#tmpl_connect").renderTag({
|
||||
client: native_client,
|
||||
forum_path: settings.static("forum_path"),
|
||||
password_id: random_id
|
||||
}).modalize((header, body, footer) => {
|
||||
const button_connect = footer.find(".button-connect");
|
||||
const button_manage = body.find(".button-manage-profiles");
|
||||
|
||||
const input_profile = body.find(".container-select-profile select");
|
||||
const input_address = body.find(".container-address input");
|
||||
const input_nickname = body.find(".container-nickname input");
|
||||
const input_password = body.find(".container-password input");
|
||||
|
||||
let updateFields = function () {
|
||||
console.log("Updating");
|
||||
if(selected_profile)
|
||||
input_nickname.attr("placeholder", selected_profile.default_username);
|
||||
else
|
||||
input_nickname.attr("placeholder", "");
|
||||
|
||||
let address = input_address.val().toString();
|
||||
settings.changeGlobal("connect_address", address);
|
||||
let flag_address = !!address.match(Regex.IP_V4) || !!address.match(Regex.DOMAIN);
|
||||
|
||||
let nickname = input_nickname.val().toString();
|
||||
settings.changeGlobal("connect_name", nickname);
|
||||
let flag_nickname = (nickname.length == 0 && selected_profile && selected_profile.default_username.length > 0) || nickname.length >= 3 && nickname.length <= 32;
|
||||
|
||||
input_address.attr('pattern', flag_address ? null : '^[a]{1000}$').toggleClass('is-invalid', !flag_address);
|
||||
input_nickname.attr('pattern', flag_nickname ? null : '^[a]{1000}$').toggleClass('is-invalid', !flag_nickname);
|
||||
|
||||
if(!flag_nickname || !flag_address || !selected_profile || !selected_profile.valid()) {
|
||||
button_connect.prop("disabled", true);
|
||||
} else {
|
||||
button_connect.prop("disabled", false);
|
||||
}
|
||||
};
|
||||
|
||||
input_nickname.val(settings.static_global("connect_name", undefined));
|
||||
input_address.val(defaultHost.enforce ? defaultHost.url : settings.static_global("connect_address", defaultHost.url));
|
||||
input_address
|
||||
.on("keyup", () => updateFields())
|
||||
.on('keydown', event => {
|
||||
if(event.keyCode == JQuery.Key.Enter && !event.shiftKey)
|
||||
button_connect.trigger('click');
|
||||
});
|
||||
|
||||
let updateFields = function () {
|
||||
if(selected_profile) tag.find(".connect_nickname").attr("placeholder", selected_profile.default_username);
|
||||
else
|
||||
tag.find(".connect_nickname").attr("");
|
||||
|
||||
let button = tag.parents(".modal-content").find(".connect_connect_button");
|
||||
|
||||
let field_address = tag.find(".connect_address");
|
||||
let address = field_address.val().toString();
|
||||
settings.changeGlobal("connect_address", address);
|
||||
let flag_address = !!address.match(Regex.IP_V4) || !!address.match(Regex.DOMAIN);
|
||||
|
||||
let field_nickname = tag.find(".connect_nickname");
|
||||
let nickname = field_nickname.val().toString();
|
||||
settings.changeGlobal("connect_name", nickname);
|
||||
let flag_nickname = (nickname.length == 0 && selected_profile && selected_profile.default_username.length > 0) || nickname.length >= 3 && nickname.length <= 32;
|
||||
|
||||
if(flag_address) {
|
||||
if(field_address.hasClass("invalid_input"))
|
||||
field_address.removeClass("invalid_input");
|
||||
} else {
|
||||
if(!field_address.hasClass("invalid_input"))
|
||||
field_address.addClass("invalid_input");
|
||||
}
|
||||
|
||||
if(flag_nickname) {
|
||||
if(field_nickname.hasClass("invalid_input"))
|
||||
field_nickname.removeClass("invalid_input");
|
||||
} else {
|
||||
if(!field_nickname.hasClass("invalid_input"))
|
||||
field_nickname.addClass("invalid_input");
|
||||
}
|
||||
|
||||
if(!flag_nickname || !flag_address || !selected_profile || !selected_profile.valid()) {
|
||||
button.prop("disabled", true);
|
||||
} else {
|
||||
button.prop("disabled", false);
|
||||
}
|
||||
};
|
||||
|
||||
tag.find(".connect_nickname").val(settings.static_global("connect_name", undefined));
|
||||
tag.find(".connect_address").val(defaultHost.enforce ? defaultHost.url : settings.static_global("connect_address", defaultHost.url));
|
||||
tag.find(".connect_address")
|
||||
.on("keyup", () => updateFields())
|
||||
.on('keydown', event => {
|
||||
if(event.keyCode == JQuery.Key.Enter && !event.shiftKey)
|
||||
tag.parents(".modal-content").find(".connect_connect_button").trigger('click');
|
||||
});
|
||||
|
||||
tag.find(".button-manage-profiles").on('click', event => {
|
||||
const modal = Modals.spawnSettingsModal();
|
||||
setTimeout(() => {
|
||||
modal.htmlTag.find(".tab-profiles").parent(".entry").trigger('click');
|
||||
}, 100);
|
||||
modal.close_listener.push(() => {
|
||||
tag.find(".profile-select-container select").trigger('change');
|
||||
});
|
||||
return true;
|
||||
button_manage.on('click', event => {
|
||||
const modal = Modals.spawnSettingsModal();
|
||||
setTimeout(() => {
|
||||
modal.htmlTag.find(".tab-profiles").parent(".entry").trigger('click');
|
||||
}, 100);
|
||||
modal.close_listener.push(() => {
|
||||
input_profile.trigger('change');
|
||||
});
|
||||
return true;
|
||||
});
|
||||
|
||||
{
|
||||
const select_tag = tag.find(".profile-select-container select");
|
||||
const select_invalid_tag = tag.find(".profile-invalid");
|
||||
|
||||
for(const profile of profiles.profiles()) {
|
||||
select_tag.append(
|
||||
$.spawn("option").text(profile.profile_name).val(profile.id)
|
||||
);
|
||||
}
|
||||
|
||||
select_tag.on('change', event => {
|
||||
selected_profile = profiles.find_profile(select_tag.val() as string);
|
||||
if(!selected_profile || !selected_profile.valid())
|
||||
select_invalid_tag.show();
|
||||
else
|
||||
select_invalid_tag.hide();
|
||||
updateFields();
|
||||
});
|
||||
select_tag.val(connect_profile && connect_profile.enforce ? connect_profile.profile.id : connect_profile && connect_profile.profile ? connect_profile.profile.id : 'default').trigger('change');
|
||||
{
|
||||
for(const profile of profiles.profiles()) {
|
||||
input_profile.append(
|
||||
$.spawn("option").text(profile.profile_name).val(profile.id)
|
||||
);
|
||||
}
|
||||
|
||||
tag.find(".connect_nickname").on("keyup", () => updateFields());
|
||||
input_profile.on('change', event => {
|
||||
selected_profile = profiles.find_profile(input_profile.val() as string);
|
||||
input_profile.toggleClass("is-invalid", !selected_profile || !selected_profile.valid());
|
||||
updateFields();
|
||||
});
|
||||
input_profile.val(connect_profile && connect_profile.enforce ? connect_profile.profile.id : connect_profile && connect_profile.profile ? connect_profile.profile.id : 'default').trigger('change');
|
||||
}
|
||||
|
||||
input_nickname.on("keyup", () => updateFields());
|
||||
setTimeout(() => updateFields(), 100);
|
||||
|
||||
button_connect.on('click', event => {
|
||||
connect_modal.close();
|
||||
|
||||
globalClient.startConnection(
|
||||
input_address.val().toString(),
|
||||
selected_profile,
|
||||
input_nickname.val().toString() || selected_profile.default_username,
|
||||
{password: input_password.val().toString(), hashed: false}
|
||||
);
|
||||
});
|
||||
}, {
|
||||
width: '70%'
|
||||
});
|
||||
|
||||
connect_modal.open();
|
||||
return;
|
||||
|
||||
|
||||
const connectModal = createModal({
|
||||
header: (tr("Create a new connection")),
|
||||
body: function () {
|
||||
const random_id = (() => {
|
||||
const array = new Uint32Array(10);
|
||||
window.crypto.getRandomValues(array);
|
||||
return array.join("");
|
||||
})();
|
||||
|
||||
let tag = $("#tmpl_connect").renderTag({
|
||||
client: native_client,
|
||||
forum_path: settings.static("forum_path"),
|
||||
password_id: random_id
|
||||
});
|
||||
|
||||
|
||||
setTimeout(() => updateFields(), 100);
|
||||
//connect_address
|
||||
return tag;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ namespace Modals {
|
|||
channel_flag_maxfamilyclients_unlimited: true,
|
||||
channel_flag_maxclients_unlimited: true
|
||||
} as ChannelProperties);
|
||||
template = $.spawn("div").append(template);
|
||||
return template.tabify();
|
||||
},
|
||||
footer: () => {
|
||||
|
|
@ -36,7 +35,7 @@ namespace Modals {
|
|||
applyGeneralListener(properties, modal.htmlTag.find(".general_properties"), modal.htmlTag.find(".button_ok"), !channel);
|
||||
applyStandardListener(properties, modal.htmlTag.find(".settings_standard"), modal.htmlTag.find(".button_ok"), parent, !channel);
|
||||
applyPermissionListener(properties, modal.htmlTag.find(".settings_permissions"), modal.htmlTag.find(".button_ok"), permissions, channel);
|
||||
applyAudioListener(properties, modal.htmlTag.find(".settings_audio"), modal.htmlTag.find(".button_ok"), channel);
|
||||
applyAudioListener(properties, modal.htmlTag.find(".container-channel-settings-audio"), modal.htmlTag.find(".button_ok"), channel);
|
||||
applyAdvancedListener(properties, modal.htmlTag.find(".settings_advanced"), modal.htmlTag.find(".button_ok"), channel);
|
||||
|
||||
let updated: PermissionValue[] = [];
|
||||
|
|
@ -144,11 +143,11 @@ namespace Modals {
|
|||
properties.channel_flag_default = this.checked;
|
||||
|
||||
let elements = tag.find("input[name=\"channel_type\"]");
|
||||
elements.prop("disabled", this.checked);
|
||||
if(this.checked) {
|
||||
elements.prop("enabled", false);
|
||||
elements.prop("checked", false);
|
||||
tag.find("input[name=\"channel_type\"][value=\"perm\"]").prop("checked", true).trigger("change");
|
||||
} else elements.removeProp("enabled");
|
||||
}
|
||||
}).prop("disabled",
|
||||
!globalClient.permissions.neededPermission(create ? PermissionType.B_CHANNEL_CREATE_PERMANENT : PermissionType.B_CHANNEL_MODIFY_MAKE_PERMANENT).granted(1) ||
|
||||
!globalClient.permissions.neededPermission(create ? PermissionType.B_CHANNEL_CREATE_WITH_DEFAULT : PermissionType.B_CHANNEL_MODIFY_MAKE_DEFAULT).granted(1));
|
||||
|
|
@ -158,7 +157,7 @@ namespace Modals {
|
|||
}).prop("disabled", !globalClient.permissions.neededPermission(create ? PermissionType.B_CHANNEL_CREATE_WITH_NEEDED_TALK_POWER : PermissionType.B_CHANNEL_MODIFY_NEEDED_TALK_POWER).granted(1));
|
||||
|
||||
let orderTag = tag.find(".order_id");
|
||||
for(let channel of (parent ? parent.siblings() : globalClient.channelTree.rootChannel()))
|
||||
for(let channel of (parent ? parent.children() : globalClient.channelTree.rootChannel()))
|
||||
$.spawn("option").attr("channelId", channel.channelId.toString()).text(channel.channelName()).appendTo(orderTag);
|
||||
|
||||
orderTag.change(function (this: HTMLSelectElement) {
|
||||
|
|
@ -176,7 +175,7 @@ namespace Modals {
|
|||
for(let cperm of channel_permissions)
|
||||
if(cperm.type.name == PermissionType.I_CHANNEL_NEEDED_MODIFY_POWER) {
|
||||
required_power = cperm.value;
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
tag.find("input[permission]").each((index, _element) => {
|
||||
|
|
@ -203,14 +202,14 @@ namespace Modals {
|
|||
});
|
||||
|
||||
if(!permissions.neededPermission(PermissionType.I_CHANNEL_MODIFY_POWER).granted(required_power, false)) {
|
||||
tag.find("input[permission]").prop("enabled", false); //No permissions
|
||||
tag.find("input[permission]").prop("disabled", false); //No permissions
|
||||
}
|
||||
};
|
||||
|
||||
if(channel) {
|
||||
permissions.requestChannelPermissions(channel.getChannelId()).then(apply_permissions).catch((error) => {
|
||||
tag.find("input[permission]").prop("enabled", false);
|
||||
console.log(error);
|
||||
tag.find("input[permission]").prop("disabled", true);
|
||||
console.log("Failed to receive channel permissions (%o)", error);
|
||||
});
|
||||
} else apply_permissions([]);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -83,7 +83,6 @@ namespace Modals {
|
|||
header: tr("Edit playlist"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_playlist_edit").renderTag().tabify();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
callback_permission_update = apply_permissions(template, client, playlist, (key, value) => {
|
||||
console.log("Change permission %o => %o", key, value);
|
||||
|
|
@ -299,8 +298,8 @@ namespace Modals {
|
|||
const owns_playlist = playlist.playlist_owner_dbid == client.getClient().properties.client_database_id;
|
||||
|
||||
client.serverConnection.helper.request_playlist_info(playlist.playlist_id).then(info => {
|
||||
tag.find(".property-owner .value")
|
||||
.text(info.playlist_owner_name + " (" + info.playlist_owner_dbid + ")");
|
||||
tag.find(".property-owner input")
|
||||
.val(info.playlist_owner_name + " (" + info.playlist_owner_dbid + ")");
|
||||
|
||||
tag.find(".property-title input")
|
||||
.val(info.playlist_title)
|
||||
|
|
@ -337,8 +336,8 @@ namespace Modals {
|
|||
change_property("playlist_flag_delete_played", (<HTMLInputElement>event.target).checked ? "1" : "0");
|
||||
});
|
||||
|
||||
tag.find(".property-current-song .value")
|
||||
.text(info.playlist_current_song_id);
|
||||
tag.find(".property-current-song input")
|
||||
.val(info.playlist_current_song_id);
|
||||
callback_current_song(info.playlist_current_song_id);
|
||||
|
||||
tag.find(".property-flag-finished input")
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ namespace Modals {
|
|||
header: tr("Manage playlists"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_playlist_list").renderTag();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
/* first open the modal */
|
||||
setTimeout(() => {
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ namespace Modals {
|
|||
export function spawnQueryCreated(credentials: {
|
||||
username: string,
|
||||
password: string
|
||||
}, yust_created: boolean) {
|
||||
}, just_created: boolean) {
|
||||
let modal;
|
||||
modal = createModal({
|
||||
header: yust_created ? tr("Server query credentials") : tr("New server query credentials"),
|
||||
header: just_created ? tr("Server query credentials") : tr("New server query credentials"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_query_created").renderTag(credentials);
|
||||
template = $.spawn("div").append(template);
|
||||
|
|
|
|||
|
|
@ -3,35 +3,17 @@
|
|||
namespace Modals {
|
||||
export function createServerModal(server: ServerEntry, callback: (properties?: ServerProperties) => any) {
|
||||
let properties: ServerProperties = {} as ServerProperties; //The changes properties
|
||||
const modal = createModal({
|
||||
header: tr("Manager the Virtual Server"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_server_edit").renderTag(server.properties);
|
||||
template = $.spawn("div").append(template);
|
||||
return template.tabify();
|
||||
},
|
||||
footer: () => {
|
||||
let footer = $.spawn("div");
|
||||
footer.addClass("modal-button-group");
|
||||
footer.css("margin", "5px");
|
||||
|
||||
let buttonCancel = $.spawn("button");
|
||||
buttonCancel.text(tr("Cancel")).addClass("button_cancel");
|
||||
|
||||
let buttonOk = $.spawn("button");
|
||||
buttonOk.text(tr("Ok")).addClass("button_ok");
|
||||
|
||||
footer.append(buttonCancel);
|
||||
footer.append(buttonOk);
|
||||
|
||||
return footer;
|
||||
},
|
||||
width: 750
|
||||
const modal_template = $("#tmpl_server_edit").renderTag(server.properties);
|
||||
const modal = modal_template.modalize((header, body, footer) => {
|
||||
return {
|
||||
body: body.tabify()
|
||||
}
|
||||
});
|
||||
|
||||
server_applyGeneralListener(properties, modal.htmlTag.find(".properties_general"), modal.htmlTag.find(".button_ok"));
|
||||
server_applyTransferListener(properties, server, modal.htmlTag.find('.container-file-transfer'));
|
||||
server_applyHostListener(properties, server.properties, modal.htmlTag.find(".properties_host"), modal.htmlTag.find(".button_ok"));
|
||||
server_applyTransferListener(properties, server, modal.htmlTag.find('.properties_transfer'));
|
||||
server_applyHostListener(server, properties, server.properties, modal.htmlTag.find(".properties_host"), modal.htmlTag.find(".button_ok"));
|
||||
server_applyMessages(properties, server, modal.htmlTag.find(".properties_messages"));
|
||||
server_applyFlood(properties, server, modal.htmlTag.find(".properties_flood"));
|
||||
server_applySecurity(properties, server, modal.htmlTag.find(".properties_security"));
|
||||
|
|
@ -102,7 +84,7 @@ namespace Modals {
|
|||
}
|
||||
|
||||
|
||||
function server_applyHostListener(properties: ServerProperties, original_properties: ServerProperties, tag: JQuery, button: JQuery) {
|
||||
function server_applyHostListener(server: ServerEntry, properties: ServerProperties, original_properties: ServerProperties, tag: JQuery, button: JQuery) {
|
||||
tag.find(".virtualserver_host").change(function (this: HTMLInputElement) {
|
||||
properties.virtualserver_host = this.value;
|
||||
}).prop("disabled", !globalClient.permissions.neededPermission(PermissionType.B_VIRTUALSERVER_MODIFY_HOST).granted(1));
|
||||
|
|
@ -152,6 +134,10 @@ namespace Modals {
|
|||
properties.virtualserver_hostbutton_gfx_url = this.value;
|
||||
}).prop("disabled", !globalClient.permissions.neededPermission(PermissionType.B_VIRTUALSERVER_MODIFY_HOSTBUTTON).granted(1));
|
||||
|
||||
server.updateProperties().then(() => {
|
||||
tag.find(".virtualserver_host").val(server.properties.virtualserver_host);
|
||||
tag.find(".virtualserver_port").val(server.properties.virtualserver_port);
|
||||
});
|
||||
}
|
||||
|
||||
function server_applyMessages(properties: ServerProperties, server: ServerEntry, tag: JQuery) {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,6 @@
|
|||
/// <reference path="../../profiles/Identity.ts" />
|
||||
|
||||
namespace Modals {
|
||||
import TranslationRepository = i18n.TranslationRepository;
|
||||
import ConnectionProfile = profiles.ConnectionProfile;
|
||||
import IdentitifyType = profiles.identities.IdentitifyType;
|
||||
|
||||
function spawnTeamSpeakIdentityImprove(identity: profiles.identities.TeaSpeakIdentity) : Modal {
|
||||
let modal: Modal;
|
||||
let elapsed_timer: NodeJS.Timer;
|
||||
|
|
@ -22,11 +18,11 @@ namespace Modals {
|
|||
let active;
|
||||
const button_start_stop = template.find(".button-start-stop");
|
||||
const button_close = template.find(".button-close");
|
||||
const input_current_level = template.find(".property.identity-level input");
|
||||
const input_target_level = template.find(".property.identity-target-level input");
|
||||
const input_threads = template.find(".property.threads input");
|
||||
const input_hash_rate = template.find(".property.hash-rate input");
|
||||
const input_elapsed = template.find(".property.time-elapsed input");
|
||||
const input_current_level = template.find(".identity-level input");
|
||||
const input_target_level = template.find(".identity-target-level input");
|
||||
const input_threads = template.find(".threads input");
|
||||
const input_hash_rate = template.find(".hash-rate input");
|
||||
const input_elapsed = template.find(".time-elapsed input");
|
||||
|
||||
button_close.on('click', event => {
|
||||
if(active)
|
||||
|
|
@ -37,10 +33,10 @@ namespace Modals {
|
|||
});
|
||||
|
||||
button_start_stop.on('click', event => {
|
||||
if(active)
|
||||
button_start_stop.text(tr("Start"));
|
||||
else
|
||||
button_start_stop.text(tr("Stop"));
|
||||
button_start_stop
|
||||
.toggleClass('btn-success', active)
|
||||
.toggleClass('btn-danger', !active)
|
||||
.text(active ? tr("Start") : tr("Stop"));
|
||||
|
||||
input_threads.prop("disabled", !active);
|
||||
input_target_level.prop("disabled", !active);
|
||||
|
|
@ -58,6 +54,8 @@ namespace Modals {
|
|||
if(target_level == 0) {
|
||||
identity.improve_level(-1, threads, () => active, current_level => {
|
||||
input_current_level.val(current_level);
|
||||
}, hash_rate => {
|
||||
input_hash_rate.val(hash_rate);
|
||||
}).catch(error => {
|
||||
console.error(error);
|
||||
createErrorModal(tr("Failed to improve identity"), tr("Failed to improve identity.<br>Error:") + error).open();
|
||||
|
|
@ -67,6 +65,8 @@ namespace Modals {
|
|||
} else {
|
||||
identity.improve_level(target_level, threads, () => active, current_level => {
|
||||
input_current_level.val(current_level);
|
||||
}, hash_rate => {
|
||||
input_hash_rate.val(hash_rate);
|
||||
}).then(success => {
|
||||
if(success) {
|
||||
identity.level().then(level => {
|
||||
|
|
@ -103,7 +103,7 @@ namespace Modals {
|
|||
});
|
||||
|
||||
|
||||
template.find(".property.identity-unique-id input").val(identity.uid());
|
||||
template.find(".identity-unique-id input").val(identity.uid());
|
||||
identity.level().then(level => {
|
||||
input_current_level.val(level);
|
||||
}).catch(error => {
|
||||
|
|
@ -208,7 +208,6 @@ namespace Modals {
|
|||
forum_path: settings.static("forum_path"),
|
||||
});
|
||||
|
||||
template = $.spawn("div").append(template);
|
||||
initialiseVoiceListeners(modal, (template = template.tabify()).find(".settings_audio"));
|
||||
initialise_translations(template.find(".settings-translations"));
|
||||
initialise_profiles(modal, template.find(".settings-profiles"));
|
||||
|
|
@ -216,20 +215,7 @@ namespace Modals {
|
|||
|
||||
return template;
|
||||
},
|
||||
footer: () => {
|
||||
let footer = $.spawn("div");
|
||||
footer.addClass("modal-button-group");
|
||||
footer.css("margin-top", "5px");
|
||||
footer.css("margin-bottom", "5px");
|
||||
footer.css("text-align", "right");
|
||||
|
||||
let buttonOk = $.spawn("button");
|
||||
buttonOk.text(tr("Ok"));
|
||||
buttonOk.click(() => modal.close());
|
||||
footer.append(buttonOk);
|
||||
|
||||
return footer;
|
||||
},
|
||||
footer: undefined,
|
||||
width: 750
|
||||
});
|
||||
modal.open();
|
||||
|
|
@ -295,7 +281,7 @@ namespace Modals {
|
|||
globalClient.voiceConnection.voiceRecorder.update(true);
|
||||
vad.percentage_listener = per => {
|
||||
vad_tag.find(".vad_vad_bar_filler")
|
||||
.css("width", per + "%");
|
||||
.css("width", (100 - per) + "%");
|
||||
};
|
||||
break;
|
||||
}
|
||||
|
|
@ -372,15 +358,24 @@ namespace Modals {
|
|||
setTimeout(() => target_tag.trigger('change'), 0);
|
||||
}
|
||||
|
||||
const display_error = (message: string) => {
|
||||
const alert = tag.find(".settings-device-error").first();
|
||||
alert.clone()
|
||||
.alert()
|
||||
.css("display", "block")
|
||||
.insertAfter(alert)
|
||||
.find(".message")
|
||||
.text(message);
|
||||
};
|
||||
|
||||
{ //Initialize microphone
|
||||
|
||||
const setting_tag = tag.find(".settings-microphone");
|
||||
const tag_select = setting_tag.find(".audio-select-microphone");
|
||||
console.log(setting_tag);
|
||||
console.log(setting_tag.find(".settings-device-error"));
|
||||
console.log(setting_tag.find(".settings-device-error").html());
|
||||
|
||||
{ //List devices
|
||||
const update_devices = () => { //List devices
|
||||
tag_select.empty();
|
||||
|
||||
$.spawn("option")
|
||||
.attr("device-id", "")
|
||||
.attr("device-group", "")
|
||||
|
|
@ -391,7 +386,7 @@ namespace Modals {
|
|||
const active_device = globalClient.voiceConnection.voiceRecorder.device_id();
|
||||
|
||||
for(const device of devices) {
|
||||
console.debug(tr("Got device %s (%s): %s"), device.deviceId, device.kind, device.label);
|
||||
console.debug(tr("Got device %s (%s): %s (%o)"), device.deviceId, device.kind, device.label);
|
||||
if(device.kind !== 'audioinput') continue;
|
||||
|
||||
$.spawn("option")
|
||||
|
|
@ -404,15 +399,13 @@ namespace Modals {
|
|||
}).catch(error => {
|
||||
console.error(tr("Could not enumerate over devices!"));
|
||||
console.error(error);
|
||||
setting_tag.find(".settings-device-error")
|
||||
.text(tr("Could not get device list!"))
|
||||
.css("display", "block");
|
||||
display_error(tr("Could not get microphone device list!"));
|
||||
});
|
||||
|
||||
if(tag_select.find("option:selected").length == 0)
|
||||
tag_select.find("option").prop("selected", true);
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
{
|
||||
tag_select.on('change', event => {
|
||||
|
|
@ -423,47 +416,53 @@ namespace Modals {
|
|||
globalClient.voiceConnection.voiceRecorder.change_device(deviceId, groupId);
|
||||
});
|
||||
}
|
||||
|
||||
update_devices();
|
||||
setting_tag.find(".button-device-update").on('click', event => update_devices());
|
||||
}
|
||||
|
||||
{ //Initialize speaker
|
||||
const setting_tag = tag.find(".settings-speaker");
|
||||
const tag_select = setting_tag.find(".audio-select-speaker");
|
||||
const active_device = audio.player.current_device();
|
||||
|
||||
audio.player.available_devices().then(devices => {
|
||||
for(const device of devices) {
|
||||
$.spawn("option")
|
||||
.attr("device-id", device.device_id)
|
||||
.text(device.name)
|
||||
.prop("selected", device.device_id == active_device.device_id)
|
||||
.appendTo(tag_select);
|
||||
}
|
||||
}).catch(error => {
|
||||
console.error(tr("Could not enumerate over devices!"));
|
||||
console.error(error);
|
||||
setting_tag.find(".settings-device-error")
|
||||
.text(tr("Could not get device list!"))
|
||||
.css("display", "block");
|
||||
});
|
||||
|
||||
|
||||
if(tag_select.find("option:selected").length == 0)
|
||||
tag_select.find("option").prop("selected", true);
|
||||
const update_devices = () => {
|
||||
tag_select.empty();
|
||||
|
||||
const active_device = audio.player.current_device();
|
||||
audio.player.available_devices().then(devices => {
|
||||
for(const device of devices) {
|
||||
$.spawn("option")
|
||||
.attr("device-id", device.device_id)
|
||||
.text(device.name)
|
||||
.prop("selected", device.device_id == active_device.device_id)
|
||||
.appendTo(tag_select);
|
||||
}
|
||||
}).catch(error => {
|
||||
console.error(tr("Could not enumerate over devices!"));
|
||||
console.error(error);
|
||||
display_error(tr("Could not get speaker device list!"));
|
||||
});
|
||||
|
||||
|
||||
if(tag_select.find("option:selected").length == 0)
|
||||
tag_select.find("option").prop("selected", true);
|
||||
}
|
||||
|
||||
{
|
||||
const error_tag = setting_tag.find(".settings-device-error");
|
||||
tag_select.on('change', event => {
|
||||
let selected_tag = tag_select.find("option:selected");
|
||||
let deviceId = selected_tag.attr("device-id");
|
||||
console.log(tr("Selected speaker device: id: %o"), deviceId);
|
||||
audio.player.set_device(deviceId).then(() => error_tag.css("display", "none")).catch(error => {
|
||||
audio.player.set_device(deviceId).catch(error => {
|
||||
console.error(error);
|
||||
error_tag
|
||||
.text(tr("Failed to change device!"))
|
||||
.css("display", "block");
|
||||
display_error(tr("Failed to change device!"));
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
update_devices();
|
||||
setting_tag.find(".button-device-update").on('click', event => update_devices());
|
||||
}
|
||||
|
||||
{ /* initialize sounds */
|
||||
|
|
@ -616,7 +615,7 @@ namespace Modals {
|
|||
}
|
||||
|
||||
{
|
||||
const display_repository_info = (repository: TranslationRepository) => {
|
||||
const display_repository_info = (repository: i18n.TranslationRepository) => {
|
||||
const info_modal = createModal({
|
||||
header: tr("Repository info"),
|
||||
body: () => {
|
||||
|
|
@ -759,11 +758,11 @@ namespace Modals {
|
|||
|
||||
function initialise_profiles(modal: Modal, tag: JQuery) {
|
||||
const settings_tag = tag.find(".profile-settings");
|
||||
let selected_profile: ConnectionProfile;
|
||||
let selected_profile: profiles.ConnectionProfile;
|
||||
let nickname_listener: () => any;
|
||||
let status_listener: () => any;
|
||||
|
||||
const display_settings = (profile: ConnectionProfile) => {
|
||||
const display_settings = (profile: profiles.ConnectionProfile) => {
|
||||
selected_profile = profile;
|
||||
|
||||
settings_tag.find(".setting-name").val(profile.profile_name);
|
||||
|
|
@ -787,7 +786,7 @@ namespace Modals {
|
|||
profiles.mark_need_save();
|
||||
|
||||
let tag: JQuery;
|
||||
if(selected_type == IdentitifyType.TEAFORO) {
|
||||
if(selected_type == profiles.identities.IdentitifyType.TEAFORO) {
|
||||
const forum_tag = tag = settings_tag.find(".identity-settings-teaforo");
|
||||
|
||||
forum_tag.find(".connected, .disconnected").hide();
|
||||
|
|
@ -796,13 +795,13 @@ namespace Modals {
|
|||
} else {
|
||||
forum_tag.find(".disconnected").show();
|
||||
}
|
||||
} else if(selected_type == IdentitifyType.TEAMSPEAK) {
|
||||
} else if(selected_type == profiles.identities.IdentitifyType.TEAMSPEAK) {
|
||||
console.log("Set: " + identity);
|
||||
const teamspeak_tag = tag = settings_tag.find(".identity-settings-teamspeak");
|
||||
teamspeak_tag.find(".identity_string").val("");
|
||||
if(identity)
|
||||
(identity as profiles.identities.TeaSpeakIdentity).export_ts().then(e => teamspeak_tag.find(".identity_string").val(e));
|
||||
} else if(selected_type == IdentitifyType.NICKNAME) {
|
||||
} else if(selected_type == profiles.identities.IdentitifyType.NICKNAME) {
|
||||
const name_tag = tag = settings_tag.find(".identity-settings-nickname");
|
||||
if(identity)
|
||||
name_tag.find("input").val(identity.name());
|
||||
|
|
@ -857,9 +856,9 @@ namespace Modals {
|
|||
|
||||
const display_error = (error?: string) => {
|
||||
if(error){
|
||||
settings_tag.find(".error-message").show().html(error);
|
||||
settings_tag.find(".settings-profile-error").show().find(".message").html(error);
|
||||
} else
|
||||
settings_tag.find(".error-message").hide();
|
||||
settings_tag.find(".settings-profile-error").hide();
|
||||
status_listener();
|
||||
};
|
||||
|
||||
|
|
@ -874,10 +873,10 @@ namespace Modals {
|
|||
const button_improve = teamspeak_tag.find(".button-improve");
|
||||
|
||||
button_import.on('click', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
|
||||
const set_identity = (identity: profiles.identities.TeaSpeakIdentity) => {
|
||||
selected_profile.set_identity(IdentitifyType.TEAMSPEAK, identity);
|
||||
selected_profile.set_identity(profiles.identities.IdentitifyType.TEAMSPEAK, identity);
|
||||
teamspeak_tag.trigger('show');
|
||||
createInfoModal(tr("Identity imported"), tr("Your identity has been successfully imported!")).open();
|
||||
};
|
||||
|
|
@ -891,7 +890,7 @@ namespace Modals {
|
|||
spawnTeamSpeakIdentityImport(set_identity);
|
||||
});
|
||||
button_export.on('click', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
if(!profile) return;
|
||||
|
||||
createInputModal(tr("File name"), tr("Please enter the file name"), text => !!text, name => {
|
||||
|
|
@ -914,13 +913,14 @@ namespace Modals {
|
|||
});
|
||||
|
||||
button_generate.on('click', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const generate_identity = () => {
|
||||
profiles.identities.TeaSpeakIdentity.generate_new().then(identity => {
|
||||
selected_profile.set_identity(IdentitifyType.TEAMSPEAK, identity);
|
||||
selected_profile.set_identity(profiles.identities.IdentitifyType.TEAMSPEAK, identity);
|
||||
teamspeak_tag.trigger('show');
|
||||
createInfoModal(tr("Identity generate"), tr("A new identity had been successfully generated")).open();
|
||||
}).catch(error => {
|
||||
console.error(tr("Failed to generate a new identity. Error object: %o"), error);
|
||||
createErrorModal(tr("Failed to generate identity"), tr("Failed to generate a new identity.<br>Error:") + error).open();
|
||||
});
|
||||
};
|
||||
|
|
@ -935,7 +935,7 @@ namespace Modals {
|
|||
});
|
||||
|
||||
button_improve.on('click', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
if(!profile) return;
|
||||
|
||||
spawnTeamSpeakIdentityImprove(profile).close_listener.push(() => teamspeak_tag.trigger('show'));
|
||||
|
|
@ -943,7 +943,7 @@ namespace Modals {
|
|||
|
||||
/* updates the data */
|
||||
teamspeak_tag.on('show', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.TEAMSPEAK) as profiles.identities.TeaSpeakIdentity;
|
||||
|
||||
if(!profile || !profile.valid()) {
|
||||
identity_info_tag.hide();
|
||||
|
|
@ -954,8 +954,8 @@ namespace Modals {
|
|||
teamspeak_tag.find(".identity-undefined").hide();
|
||||
button_export.prop("disabled", false);
|
||||
|
||||
identity_info_tag.find(".property.unique-id input").val(profile.uid());
|
||||
const input_level = identity_info_tag.find(".property.level input").val("loading...");
|
||||
identity_info_tag.find(".unique-id input").val(profile.uid());
|
||||
const input_level = identity_info_tag.find(".level input").val("loading...");
|
||||
profile.level().then(level => input_level.val(level.toString())).catch(error => input_level.val("error: " + error));
|
||||
}
|
||||
display_error();
|
||||
|
|
@ -989,7 +989,7 @@ namespace Modals {
|
|||
const name_tag = settings_tag.find(".identity-settings-nickname");
|
||||
name_tag.find(".setting-name").on('change keyup', event => {
|
||||
const name = name_tag.find(".setting-name").val() as string;
|
||||
selected_profile.set_identity(IdentitifyType.NICKNAME, new profiles.identities.NameIdentity(name));
|
||||
selected_profile.set_identity(profiles.identities.IdentitifyType.NICKNAME, new profiles.identities.NameIdentity(name));
|
||||
profiles.mark_need_save();
|
||||
|
||||
if(name.length < 3) {
|
||||
|
|
@ -1000,7 +1000,7 @@ namespace Modals {
|
|||
});
|
||||
|
||||
name_tag.on('show', event => {
|
||||
const profile = selected_profile.selected_identity(IdentitifyType.NICKNAME);
|
||||
const profile = selected_profile.selected_identity(profiles.identities.IdentitifyType.NICKNAME);
|
||||
if(!profile)
|
||||
display_error("invalid profile");
|
||||
else if(!profile.valid())
|
||||
|
|
|
|||
|
|
@ -1,38 +1,44 @@
|
|||
/// <reference path="../../utils/modal.ts" />
|
||||
|
||||
namespace Modals {
|
||||
export function spawnYesNo(header: BodyCreator, body: BodyCreator, callback: (_: boolean) => any) {
|
||||
let modal;
|
||||
modal = createModal({
|
||||
header: header,
|
||||
body: body,
|
||||
footer: () => {
|
||||
let footer = $.spawn("div");
|
||||
footer.addClass("modal-button-group");
|
||||
footer.css("margin-top", "5px");
|
||||
footer.css("margin-bottom", "5px");
|
||||
footer.css("text-align", "right");
|
||||
export function spawnYesNo(header: BodyCreator, body: BodyCreator, callback: (_: boolean) => any, properties?: {
|
||||
text_yes?: string,
|
||||
text_no?: string
|
||||
}) {
|
||||
properties = properties || {};
|
||||
|
||||
let button_yes = $.spawn("button");
|
||||
button_yes.text(tr("Yes"));
|
||||
button_yes.click(() => {
|
||||
modal.close();
|
||||
callback(true);
|
||||
});
|
||||
footer.append(button_yes);
|
||||
const props = ModalFunctions.warpProperties({});
|
||||
props.template_properties || (props.template_properties = {});
|
||||
props.template_properties.text_yes = properties.text_yes || tr("Yes");
|
||||
props.template_properties.text_no = properties.text_no || tr("No");
|
||||
props.template = "#tmpl_modal_yesno";
|
||||
|
||||
let button_no = $.spawn("button");
|
||||
button_no.text(tr("No"));
|
||||
button_no.click(() => {
|
||||
modal.close();
|
||||
callback(false);
|
||||
});
|
||||
footer.append(button_no);
|
||||
props.header = header;
|
||||
props.template_properties.question = ModalFunctions.jqueriefy(body);
|
||||
|
||||
return footer;
|
||||
},
|
||||
width: 750
|
||||
const modal = createModal(props);
|
||||
let submited = false;
|
||||
const button_yes = modal.htmlTag.find(".button-yes");
|
||||
const button_no = modal.htmlTag.find(".button-no");
|
||||
|
||||
button_yes.on('click', event => {
|
||||
if(!submited) {
|
||||
submited = true;
|
||||
callback(true);
|
||||
}
|
||||
modal.close();
|
||||
});
|
||||
|
||||
button_no.on('click', event => {
|
||||
if(!submited) {
|
||||
submited = true;
|
||||
callback(false);
|
||||
}
|
||||
modal.close();
|
||||
});
|
||||
|
||||
modal.close_listener.push(() => button_no.trigger('click'));
|
||||
modal.open();
|
||||
return modal;
|
||||
}
|
||||
}
|
||||
|
|
@ -94,17 +94,23 @@ class ServerEntry {
|
|||
get htmlTag() {
|
||||
if(this._htmlTag) return this._htmlTag;
|
||||
|
||||
let tag = $.spawn("div");
|
||||
let tag = $.spawn("div").addClass("tree-entry server");
|
||||
|
||||
tag.attr("id", "server");
|
||||
tag.addClass("server");
|
||||
tag.append($.spawn("div").addClass("server_type icon client-server_green"));
|
||||
tag.append($.spawn("a").addClass("name").text(this.properties.virtualserver_name));
|
||||
tag.append(
|
||||
$.spawn("div")
|
||||
.addClass("server_type icon client-server_green")
|
||||
);
|
||||
|
||||
const serverIcon = $("<span/>");
|
||||
//we cant spawn an icon on creation :)
|
||||
serverIcon.append($.spawn("div").addClass("icon_property icon_empty"));
|
||||
tag.append(serverIcon);
|
||||
tag.append(
|
||||
$.spawn("div")
|
||||
.addClass("name")
|
||||
.text(this.properties.virtualserver_name)
|
||||
);
|
||||
|
||||
tag.append(
|
||||
$.spawn("div")
|
||||
.addClass("icon_property icon_empty")
|
||||
);
|
||||
|
||||
return this._htmlTag = tag;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
class ChannelTree {
|
||||
client: TSClient;
|
||||
htmlTree: JQuery;
|
||||
htmlTree_parent: JQuery;
|
||||
server: ServerEntry;
|
||||
channels: ChannelEntry[];
|
||||
clients: ClientEntry[];
|
||||
|
|
@ -18,6 +19,7 @@ class ChannelTree {
|
|||
currently_selected_context_callback: (event) => any = undefined;
|
||||
readonly client_mover: ClientMover;
|
||||
|
||||
private _tree_detached: boolean = false;
|
||||
private _show_queries: boolean;
|
||||
private channel_last?: ChannelEntry;
|
||||
private channel_first?: ChannelEntry;
|
||||
|
|
@ -29,6 +31,8 @@ class ChannelTree {
|
|||
|
||||
this.client = client;
|
||||
this.htmlTree = htmlTree;
|
||||
this.htmlTree_parent = this.htmlTree.parent();
|
||||
|
||||
this.client_mover = new ClientMover(this);
|
||||
this.reset();
|
||||
|
||||
|
|
@ -63,6 +67,18 @@ class ChannelTree {
|
|||
}});
|
||||
}
|
||||
|
||||
hide_channel_tree() {
|
||||
this.htmlTree.detach();
|
||||
this._tree_detached = true;
|
||||
}
|
||||
|
||||
show_channel_tree() {
|
||||
this._tree_detached = false;
|
||||
this.htmlTree.appendTo(this.htmlTree_parent);
|
||||
|
||||
this.channels.forEach(e => e.recalculate_repetitive_name());
|
||||
}
|
||||
|
||||
showContextMenu(x: number, y: number, on_close: () => void = undefined) {
|
||||
let channelCreate =
|
||||
this.client.permissions.neededPermission(PermissionType.B_CHANNEL_CREATE_TEMPORARY).granted(1) ||
|
||||
|
|
@ -91,12 +107,6 @@ class ChannelTree {
|
|||
let tag = element instanceof ChannelEntry ? element.rootTag() : element.tag;
|
||||
this.htmlTree.find(tag).fadeOut("slow", () => {
|
||||
tag.remove();
|
||||
if(element instanceof ChannelEntry) {
|
||||
if(element.parent_channel())
|
||||
element.parent_channel().adjustSize(true);
|
||||
} else if(element instanceof ClientEntry) {
|
||||
element.currentChannel().adjustSize(true);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -147,7 +157,7 @@ class ChannelTree {
|
|||
let previous_channel = null;
|
||||
if(channel.hasParent()) {
|
||||
let parent = channel.parent_channel();
|
||||
let siblings = parent.siblings();
|
||||
let siblings = parent.children();
|
||||
if(siblings.length == 0) {
|
||||
elm = parent.rootTag();
|
||||
previous_channel = null;
|
||||
|
|
@ -177,10 +187,11 @@ class ChannelTree {
|
|||
channel.channel_next.channel_previous = channel;
|
||||
}
|
||||
|
||||
let entry = channel.rootTag().css({display: "none"}).fadeIn("slow");
|
||||
let entry = channel.rootTag();
|
||||
if(!this._tree_detached)
|
||||
entry.css({display: "none"}).fadeIn("slow");
|
||||
entry.appendTo(tag);
|
||||
|
||||
channel.originalHeight = entry.outerHeight(false);
|
||||
if(elm != undefined)
|
||||
elm.after(entry);
|
||||
|
||||
|
|
@ -189,8 +200,8 @@ class ChannelTree {
|
|||
if(channel.channel_next == channel) /* shall never happen */
|
||||
channel.channel_next = undefined;
|
||||
|
||||
channel.adjustSize(true);
|
||||
channel.initializeListener();
|
||||
channel.update_family_index();
|
||||
}
|
||||
|
||||
findChannel(channelId: number) : ChannelEntry | undefined {
|
||||
|
|
@ -206,9 +217,9 @@ class ChannelTree {
|
|||
return undefined;
|
||||
}
|
||||
|
||||
moveChannel(channel: ChannelEntry, channel_previus: ChannelEntry, parent: ChannelEntry) {
|
||||
if(channel_previus != null && channel_previus.parent != parent) {
|
||||
console.error(tr("Invalid channel move (different parents! (%o|%o)"), channel_previus.parent, parent);
|
||||
moveChannel(channel: ChannelEntry, channel_previous: ChannelEntry, parent: ChannelEntry) {
|
||||
if(channel_previous != null && channel_previous.parent != parent) {
|
||||
console.error(tr("Invalid channel move (different parents! (%o|%o)"), channel_previous.parent, parent);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -225,36 +236,34 @@ class ChannelTree {
|
|||
this.channel_first = channel.channel_next;
|
||||
|
||||
|
||||
let oldParent = channel.parent_channel();
|
||||
channel.channel_next = undefined;
|
||||
channel.channel_previous = channel_previus;
|
||||
channel.channel_previous = channel_previous;
|
||||
channel.parent = parent;
|
||||
|
||||
if(channel_previus) {
|
||||
if(channel_previus == this.channel_last)
|
||||
if(channel_previous) {
|
||||
if(channel_previous == this.channel_last)
|
||||
this.channel_last = channel;
|
||||
|
||||
channel.channel_next = channel_previus.channel_next;
|
||||
channel_previus.channel_next = channel;
|
||||
channel_previus.rootTag().after(channel.rootTag());
|
||||
channel.channel_next = channel_previous.channel_next;
|
||||
channel_previous.channel_next = channel;
|
||||
channel_previous.rootTag().after(channel.rootTag());
|
||||
|
||||
if(channel.channel_next)
|
||||
channel.channel_next.channel_previous = channel;
|
||||
} else {
|
||||
if(parent) {
|
||||
let siblings = parent.siblings();
|
||||
if(siblings.length <= 1) { //Self should be already in there
|
||||
let children = parent.children();
|
||||
if(children.length <= 1) { //Self should be already in there
|
||||
let left = channel.rootTag();
|
||||
left.appendTo(parent.siblingTag());
|
||||
|
||||
channel.channel_next = undefined;
|
||||
} else {
|
||||
channel.channel_previous = siblings[siblings.length - 2];
|
||||
channel.channel_previous.rootTag().after(channel.rootTag());
|
||||
channel.channel_previous = undefined;
|
||||
channel.rootTag().prependTo(parent.siblingTag());
|
||||
|
||||
channel.channel_next = channel.channel_previous.channel_next;
|
||||
channel.channel_next = children[1]; /* children 0 shall be the channel itself */
|
||||
channel.channel_next.channel_previous = channel;
|
||||
channel.channel_previous.channel_next = channel;
|
||||
}
|
||||
} else {
|
||||
this.htmlTree.find(".server").after(channel.rootTag());
|
||||
|
|
@ -267,16 +276,17 @@ class ChannelTree {
|
|||
}
|
||||
}
|
||||
|
||||
if(channel.channel_previous == channel) /* shall never happen */
|
||||
channel.channel_previous = undefined;
|
||||
if(channel.channel_next == channel) /* shall never happen */
|
||||
channel.channel_next = undefined;
|
||||
channel.update_family_index();
|
||||
channel.children(true).forEach(e => e.update_family_index());
|
||||
channel.clients(true).forEach(e => e.update_family_index());
|
||||
|
||||
if(oldParent) {
|
||||
oldParent.adjustSize();
|
||||
if(channel.channel_previous == channel) { /* shall never happen */
|
||||
channel.channel_previous = undefined;
|
||||
debugger;
|
||||
}
|
||||
if(channel) {
|
||||
channel.adjustSize();
|
||||
if(channel.channel_next == channel) { /* shall never happen */
|
||||
channel.channel_next = undefined;
|
||||
debugger;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -292,18 +302,22 @@ class ChannelTree {
|
|||
else
|
||||
this.clients.push(client);
|
||||
|
||||
if(!this._show_queries && client.properties.client_type == ClientType.CLIENT_QUERY)
|
||||
client.tag.hide();
|
||||
|
||||
client.channelTree = this;
|
||||
client["_channel"] = channel;
|
||||
|
||||
let tag = client.tag.css({display: "none"}).fadeIn("slow");
|
||||
let tag = client.tag;
|
||||
|
||||
|
||||
if(!this._show_queries && client.properties.client_type == ClientType.CLIENT_QUERY)
|
||||
client.tag.hide();
|
||||
else if(!this._tree_detached)
|
||||
tag.css("display", "none").fadeIn("slow");
|
||||
|
||||
tag.appendTo(channel.clientTag());
|
||||
channel.adjustSize(true);
|
||||
client.currentChannel().reorderClients();
|
||||
|
||||
channel.updateChannelTypeIcon();
|
||||
client.update_family_index();
|
||||
return client;
|
||||
}
|
||||
|
||||
|
|
@ -312,11 +326,6 @@ class ChannelTree {
|
|||
client.channelTree = this;
|
||||
}
|
||||
|
||||
reorderAllClients() {
|
||||
for(let channel of this.channels)
|
||||
channel.reorderClients();
|
||||
}
|
||||
|
||||
moveClient(client: ClientEntry, channel: ChannelEntry) {
|
||||
let oldChannel = client.currentChannel();
|
||||
client["_channel"] = channel;
|
||||
|
|
@ -325,15 +334,14 @@ class ChannelTree {
|
|||
tag.detach();
|
||||
tag.appendTo(client.currentChannel().clientTag());
|
||||
if(oldChannel) {
|
||||
oldChannel.adjustSize();
|
||||
oldChannel.updateChannelTypeIcon();
|
||||
}
|
||||
if(client.currentChannel()) {
|
||||
client.currentChannel().adjustSize();
|
||||
client.currentChannel().reorderClients();
|
||||
client.currentChannel().updateChannelTypeIcon();
|
||||
}
|
||||
client.updateClientStatusIcons();
|
||||
client.update_family_index();
|
||||
}
|
||||
|
||||
findClient?(clientId: number) : ClientEntry {
|
||||
|
|
@ -397,7 +405,7 @@ class ChannelTree {
|
|||
if(e == entry) {
|
||||
this.currently_selected.remove(e);
|
||||
if(entry instanceof ChannelEntry)
|
||||
(entry as ChannelEntry).rootTag().find("> .channelLine").removeClass("selected");
|
||||
(entry as ChannelEntry).channelTag().removeClass("selected");
|
||||
else if(entry instanceof ClientEntry)
|
||||
(entry as ClientEntry).tag.removeClass("selected");
|
||||
else if(entry instanceof ServerEntry)
|
||||
|
|
@ -413,7 +421,7 @@ class ChannelTree {
|
|||
}
|
||||
|
||||
if(entry instanceof ChannelEntry)
|
||||
(entry as ChannelEntry).rootTag().find("> .channelLine").addClass("selected");
|
||||
(entry as ChannelEntry).channelTag().addClass("selected");
|
||||
else if(entry instanceof ClientEntry)
|
||||
(entry as ClientEntry).tag.addClass("selected");
|
||||
else if(entry instanceof ServerEntry)
|
||||
|
|
@ -630,7 +638,7 @@ class ChannelTree {
|
|||
}
|
||||
}
|
||||
|
||||
const children = channel.siblings();
|
||||
const children = channel.children();
|
||||
if(children.length > 0) {
|
||||
this.onSelect(children[0], true);
|
||||
return;
|
||||
|
|
@ -664,7 +672,7 @@ class ChannelTree {
|
|||
|
||||
if(previous) {
|
||||
while(true) {
|
||||
const siblings = previous.siblings();
|
||||
const siblings = previous.children();
|
||||
if(siblings.length == 0) break;
|
||||
previous = siblings.last();
|
||||
}
|
||||
|
|
@ -728,7 +736,6 @@ class ChannelTree {
|
|||
if(this._show_queries == flag) return;
|
||||
this._show_queries = flag;
|
||||
|
||||
//FIXME resize channels
|
||||
const channels: ChannelEntry[] = []
|
||||
for(const client of this.clients)
|
||||
if(client.properties.client_type == ClientType.CLIENT_QUERY) {
|
||||
|
|
@ -739,7 +746,9 @@ class ChannelTree {
|
|||
if(channels.indexOf(client.currentChannel()) == -1)
|
||||
channels.push(client.currentChannel());
|
||||
}
|
||||
for(const channel of channels)
|
||||
channel.adjustSize();
|
||||
}
|
||||
|
||||
get_first_channel?() : ChannelEntry {
|
||||
return this.channel_first;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$(document).on("mousedown",function (e) {
|
||||
if($(e.target).parents("#contextMenu").length == 0 && $(e.target).parents(".modal").length == 0){
|
||||
$(".modal:visible").last().find(".close").trigger("click");
|
||||
}
|
||||
});
|
||||
enum ElementType {
|
||||
HEADER,
|
||||
BODY,
|
||||
FOOTER
|
||||
}
|
||||
|
||||
type BodyCreator = (() => JQuery | JQuery[] | string) | string | JQuery | JQuery[];
|
||||
const ModalFunctions = {
|
||||
|
|
@ -11,20 +11,22 @@ const ModalFunctions = {
|
|||
return val;
|
||||
},
|
||||
|
||||
jqueriefy: function(val: BodyCreator) : JQuery {
|
||||
jqueriefy: function(val: BodyCreator, type?: ElementType) : JQuery {
|
||||
if($.isFunction(val)) val = val();
|
||||
if($.isArray(val)) {
|
||||
let result = $.spawn("div");
|
||||
for(let element of val)
|
||||
this.jqueriefy(element).appendTo(result);
|
||||
this.jqueriefy(element, type).appendTo(result);
|
||||
return result;
|
||||
}
|
||||
switch (typeof val){
|
||||
case "string": return $("<div>" + val + "</div>");
|
||||
case "string":
|
||||
if(type == ElementType.HEADER)
|
||||
return $.spawn("h5").addClass("modal-title").text(val);
|
||||
return $("<div>" + val + "</div>");
|
||||
case "object": return val as JQuery;
|
||||
case "undefined":
|
||||
console.warn(tr("Got undefined type!"));
|
||||
return $.spawn("div");
|
||||
return undefined;
|
||||
default:
|
||||
console.error(("Invalid type %o"), typeof val);
|
||||
return $();
|
||||
|
|
@ -34,8 +36,8 @@ const ModalFunctions = {
|
|||
warpProperties(data: ModalProperties | any) : ModalProperties {
|
||||
if(data instanceof ModalProperties) return data;
|
||||
else {
|
||||
let props = new ModalProperties();
|
||||
for(let key in data)
|
||||
const props = new ModalProperties();
|
||||
for(const key of Object.keys(data))
|
||||
props[key] = data[key];
|
||||
return props;
|
||||
}
|
||||
|
|
@ -43,6 +45,7 @@ const ModalFunctions = {
|
|||
};
|
||||
|
||||
class ModalProperties {
|
||||
template?: string;
|
||||
header: BodyCreator = () => "HEADER";
|
||||
body: BodyCreator = () => "BODY";
|
||||
footer: BodyCreator = () => "FOOTER";
|
||||
|
|
@ -69,9 +72,14 @@ class ModalProperties {
|
|||
else
|
||||
this.closeListener();
|
||||
}
|
||||
|
||||
template_properties?: any = {};
|
||||
trigger_tab: boolean = true;
|
||||
full_size?: boolean = false;
|
||||
}
|
||||
|
||||
class Modal {
|
||||
|
||||
private _htmlTag: JQuery;
|
||||
properties: ModalProperties;
|
||||
shown: boolean;
|
||||
|
|
@ -89,50 +97,50 @@ class Modal {
|
|||
}
|
||||
|
||||
private _create() {
|
||||
let modal = $.spawn("div");
|
||||
modal.addClass("modal");
|
||||
const header = ModalFunctions.jqueriefy(this.properties.header, ElementType.HEADER);
|
||||
const body = ModalFunctions.jqueriefy(this.properties.body, ElementType.BODY);
|
||||
const footer = ModalFunctions.jqueriefy(this.properties.footer, ElementType.FOOTER);
|
||||
|
||||
let content = $.spawn("div");
|
||||
content.addClass("modal-content");
|
||||
if(this.properties.width)
|
||||
content.css("width", this.properties.width);
|
||||
if(this.properties.height)
|
||||
content.css("height", this.properties.height);
|
||||
//FIXME: cache template
|
||||
const template = $(this.properties.template || "#tmpl_modal");
|
||||
|
||||
let header = ModalFunctions.divify(ModalFunctions.jqueriefy(this.properties.header)).addClass("modal-header");
|
||||
if(this.properties.closeable) header.append("<span class=\"close\">×</span>");
|
||||
const properties = {
|
||||
modal_header: header,
|
||||
modal_body: body,
|
||||
modal_footer: footer,
|
||||
|
||||
let body = ModalFunctions.divify(ModalFunctions.jqueriefy(this.properties.body)).addClass("modal-body");
|
||||
let footer = ModalFunctions.divify(ModalFunctions.jqueriefy(this.properties.footer)).addClass("modal-footer");
|
||||
closeable: this.properties.closeable,
|
||||
full_size: this.properties.full_size
|
||||
};
|
||||
|
||||
content.append(header);
|
||||
content.append(body);
|
||||
content.append(footer);
|
||||
if(this.properties.template_properties)
|
||||
Object.assign(properties, this.properties.template_properties);
|
||||
|
||||
modal.append(content);
|
||||
const tag = template.renderTag(properties);
|
||||
|
||||
modal.find(".close").click(function () {
|
||||
if(this.properties.closeable)
|
||||
this.close();
|
||||
}.bind(this));
|
||||
|
||||
this._htmlTag = modal;
|
||||
this._htmlTag = tag;
|
||||
this._htmlTag.on('hide.bs.modal', event => !this.properties.closeable || this.close());
|
||||
this._htmlTag.on('hidden.bs.modal', event => this._htmlTag.detach());
|
||||
}
|
||||
|
||||
open() {
|
||||
this.shown = true;
|
||||
this.htmlTag.appendTo($("body"));
|
||||
this.htmlTag.show();
|
||||
|
||||
this.htmlTag.bootstrapMaterialDesign().modal(this.properties.closeable ? 'show' : {
|
||||
backdrop: 'static',
|
||||
keyboard: false,
|
||||
});
|
||||
|
||||
if(this.properties.trigger_tab)
|
||||
this.htmlTag.one('shown.bs.modal', () => this.htmlTag.find(".tab").trigger('tab.resize'));
|
||||
}
|
||||
|
||||
close() {
|
||||
if(!this.shown) return;
|
||||
|
||||
this.shown = false;
|
||||
const _this = this;
|
||||
this.htmlTag.animate({opacity: 0}, () => {
|
||||
_this.htmlTag.detach();
|
||||
});
|
||||
this.htmlTag.modal('hide');
|
||||
this.properties.triggerClose();
|
||||
for(const listener of this.close_listener)
|
||||
listener();
|
||||
|
|
@ -144,107 +152,152 @@ function createModal(data: ModalProperties | any) : Modal {
|
|||
}
|
||||
|
||||
class InputModalProperties extends ModalProperties {
|
||||
maxLength: number;
|
||||
maxLength?: number;
|
||||
|
||||
field_title?: string;
|
||||
field_label?: string;
|
||||
field_placeholder?: string;
|
||||
|
||||
error_message?: string;
|
||||
}
|
||||
|
||||
function createInputModal(headMessage: BodyCreator, question: BodyCreator, validator: (input: string) => boolean, callback: (flag: boolean | string) => void, props: InputModalProperties | any = {}) : Modal {
|
||||
props = ModalFunctions.warpProperties(props);
|
||||
props.template_properties || (props.template_properties = {});
|
||||
props.template_properties.field_title = props.field_title;
|
||||
props.template_properties.field_label = props.field_label;
|
||||
props.template_properties.field_placeholder = props.field_placeholder;
|
||||
props.template_properties.error_message = props.error_message;
|
||||
|
||||
let head = $.spawn("div");
|
||||
head.css("border-bottom", "grey solid");
|
||||
head.css("border-width", "1px");
|
||||
ModalFunctions.jqueriefy(headMessage).appendTo(head);
|
||||
props.template = "#tmpl_modal_input";
|
||||
|
||||
props.header = headMessage;
|
||||
props.template_properties.question = ModalFunctions.jqueriefy(question);
|
||||
|
||||
let body = $.spawn("div");
|
||||
ModalFunctions.divify(ModalFunctions.jqueriefy(question)).appendTo(body);
|
||||
let input = $.spawn("input");
|
||||
input.css("width", "100%");
|
||||
input.appendTo(body);
|
||||
console.log(input);
|
||||
const modal = createModal(props);
|
||||
|
||||
let footer = $.spawn("div");
|
||||
footer.addClass("modal-button-group");
|
||||
footer.css("margin-top", "5px");
|
||||
const input = modal.htmlTag.find(".container-value input");
|
||||
const button_cancel = modal.htmlTag.find(".button-cancel");
|
||||
const button_submit = modal.htmlTag.find(".button-submit");
|
||||
|
||||
let buttonCancel = $.spawn("button");
|
||||
buttonCancel.text("Cancel");
|
||||
let submited = false;
|
||||
input.on('keyup change', event => {
|
||||
const str = input.val() as string;
|
||||
const valid = str !== undefined && validator(str);
|
||||
|
||||
let buttonOk = $.spawn("button");
|
||||
buttonOk.text("Ok");
|
||||
|
||||
footer.append(buttonCancel);
|
||||
footer.append(buttonOk);
|
||||
|
||||
input.on("keydown", function (event) {
|
||||
if(event.keyCode == JQuery.Key.Enter) {
|
||||
buttonOk.trigger("click");
|
||||
}
|
||||
input.attr("pattern", valid ? null : "^[a]{1000}$").toggleClass("is-invalid", !valid);
|
||||
button_submit.prop("disabled", !valid);
|
||||
});
|
||||
|
||||
let updateValidation = function () {
|
||||
let text = input.val().toString();
|
||||
let flag = (!props.maxLength || text.length <= props.maxLength) && validator(text);
|
||||
if(flag) {
|
||||
input.removeClass("invalid_input");
|
||||
buttonOk.removeAttr("disabled");
|
||||
} else {
|
||||
if(!input.hasClass("invalid_input"))
|
||||
input.addClass("invalid_input");
|
||||
buttonOk.attr("disabled", "true");
|
||||
button_submit.on('click', event => {
|
||||
if(!submited) {
|
||||
submited = true;
|
||||
const str = input.val() as string;
|
||||
if(str !== undefined && validator(str))
|
||||
callback(str);
|
||||
else
|
||||
callback(false);
|
||||
}
|
||||
};
|
||||
input.on("keyup", updateValidation);
|
||||
|
||||
let callbackCalled = false;
|
||||
let wrappedCallback = function (flag: boolean | string) {
|
||||
if(callbackCalled) return;
|
||||
callbackCalled = true;
|
||||
callback(flag);
|
||||
};
|
||||
|
||||
let modal;
|
||||
buttonOk.on("click", () => {
|
||||
wrappedCallback(input.val().toString());
|
||||
modal.close();
|
||||
});
|
||||
buttonCancel.on("click", () => {
|
||||
wrappedCallback(false);
|
||||
}).prop("disabled", !validator("")); /* disabled if empty input isn't allowed */
|
||||
|
||||
button_cancel.on('click', event => {
|
||||
if(!submited) {
|
||||
submited = true;
|
||||
callback(false);
|
||||
}
|
||||
modal.close();
|
||||
});
|
||||
|
||||
props.header = head;
|
||||
props.body = body;
|
||||
props.footer = footer;
|
||||
props.closeListener = () => wrappedCallback(false);
|
||||
modal = createModal(props);
|
||||
modal.close_listener.push(() => button_cancel.trigger('click'));
|
||||
return modal;
|
||||
}
|
||||
|
||||
function createErrorModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: "" }) {
|
||||
function createErrorModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) {
|
||||
props = ModalFunctions.warpProperties(props);
|
||||
(props.template_properties || (props.template_properties = {})).header_class = "modal-header-error";
|
||||
|
||||
let head = $.spawn("div");
|
||||
head.addClass("modal-head-error");
|
||||
ModalFunctions.divify(ModalFunctions.jqueriefy(header)).appendTo(head);
|
||||
props.header = head;
|
||||
props.header = header;
|
||||
props.body = message;
|
||||
return createModal(props);
|
||||
}
|
||||
|
||||
props.body = $.spawn("div").append(ModalFunctions.divify(ModalFunctions.jqueriefy(message)));
|
||||
props.footer = ModalFunctions.divify(ModalFunctions.jqueriefy(""));
|
||||
function createInfoModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) {
|
||||
props = ModalFunctions.warpProperties(props);
|
||||
(props.template_properties || (props.template_properties = {})).header_class = "modal-header-info";
|
||||
|
||||
props.header = header;
|
||||
props.body = message;
|
||||
|
||||
return createModal(props);
|
||||
}
|
||||
|
||||
function createInfoModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: "" }) {
|
||||
props = ModalFunctions.warpProperties(props);
|
||||
/* extend jquery */
|
||||
|
||||
interface ModalElements {
|
||||
header?: BodyCreator;
|
||||
body?: BodyCreator;
|
||||
footer?: BodyCreator;
|
||||
}
|
||||
|
||||
interface JQuery<TElement = HTMLElement> {
|
||||
modalize(entry_callback?: (header: JQuery, body: JQuery, footer: JQuery) => ModalElements | void, properties?: ModalProperties | any) : Modal;
|
||||
}
|
||||
|
||||
$.fn.modalize = function (this: JQuery, entry_callback?: (header: JQuery, body: JQuery, footer: JQuery) => ModalElements | void, properties?: ModalProperties | any) : Modal {
|
||||
properties = properties || {} as ModalProperties;
|
||||
entry_callback = entry_callback || ((a,b,c) => undefined);
|
||||
|
||||
let tag_modal = this[0].tagName.toLowerCase() == "modal" ? this : undefined; /* TODO may throw exception? */
|
||||
|
||||
let tag_head = tag_modal ? tag_modal.find("modal-header") : ModalFunctions.jqueriefy(properties.header);
|
||||
let tag_body = tag_modal ? tag_modal.find("modal-body") : this;
|
||||
let tag_footer = tag_modal ? tag_modal.find("modal-footer") : ModalFunctions.jqueriefy(properties.footer);
|
||||
|
||||
const result = entry_callback(tag_head, tag_body, tag_footer) || {};
|
||||
properties.header = result.header || tag_head;
|
||||
properties.body = result.body || tag_body;
|
||||
properties.footer = result.footer || tag_footer;
|
||||
return createModal(properties);
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
let head = $.spawn("div");
|
||||
head.addClass("modal-head-info");
|
||||
ModalFunctions.divify(ModalFunctions.jqueriefy(header)).appendTo(head);
|
||||
props.header = head;
|
||||
|
||||
props.body = ModalFunctions.divify(ModalFunctions.jqueriefy(message));
|
||||
props.footer = ModalFunctions.divify(ModalFunctions.jqueriefy(""));
|
||||
|
||||
return createModal(props);
|
||||
}
|
||||
|
|
@ -43,6 +43,28 @@ var TabFunctions = {
|
|||
let silentContent = $.spawn("div");
|
||||
silentContent.addClass("tab-content-invisible");
|
||||
|
||||
/* add some kind of min height */
|
||||
const update_height = () => {
|
||||
const entries: JQuery = tag.find("> .tab-content-invisible x-content, > .tab-content x-content");
|
||||
console.error(entries);
|
||||
let max_height = 0;
|
||||
|
||||
entries.each((_, _e) => {
|
||||
const entry = $(_e);
|
||||
const height = entry.visible_height();
|
||||
if(height > max_height)
|
||||
max_height = height;
|
||||
});
|
||||
|
||||
console.error("HIGHT: " + max_height);
|
||||
entries.each((_, _e) => {
|
||||
const entry = $(_e);
|
||||
entry.animate({
|
||||
'min-height': max_height + "px"
|
||||
}, 250);
|
||||
})
|
||||
};
|
||||
|
||||
template.find("x-entry").each( (_, _entry) => {
|
||||
const entry = $(_entry);
|
||||
|
||||
|
|
@ -74,6 +96,7 @@ var TabFunctions = {
|
|||
};
|
||||
show_next(0);
|
||||
|
||||
tag_content.trigger('show');
|
||||
tag_content.show();
|
||||
});
|
||||
|
||||
|
|
@ -81,11 +104,13 @@ var TabFunctions = {
|
|||
header.append(tag_header);
|
||||
});
|
||||
|
||||
header.find(".entry").first().trigger("click");
|
||||
setTimeout(() => header.find(".entry").first().trigger("click"), 0);
|
||||
|
||||
tag.append(header);
|
||||
tag.append(content);
|
||||
tag.append(silentContent);
|
||||
|
||||
tag.on('tab.resize', update_height);
|
||||
return tag;
|
||||
}
|
||||
}
|
||||
|
|
@ -101,14 +126,12 @@ if(!$.fn.asTabWidget) {
|
|||
}
|
||||
|
||||
if(!$.fn.tabify) {
|
||||
$.fn.tabify = function (copy?: boolean) {
|
||||
try {
|
||||
let self = this.asTabWidget(copy);
|
||||
this.replaceWith(self);
|
||||
} catch(object) {}
|
||||
this.find("x-tab").each(function () {
|
||||
$(this).replaceWith($(this).asTabWidget(copy));
|
||||
$.fn.tabify = function (this: JQuery, copy?: boolean) {
|
||||
const wrapped_tag = $.spawn("div").append(this);
|
||||
wrapped_tag.find("x-tab").each((_, _element) => {
|
||||
const element = $(_element);
|
||||
element.replaceWith(element.asTabWidget(copy));
|
||||
});
|
||||
return this;
|
||||
return wrapped_tag.children();
|
||||
}
|
||||
}
|
||||
|
|
@ -21,19 +21,23 @@ class CodecPool {
|
|||
private _supported: boolean = true;
|
||||
|
||||
initialize(cached: number) {
|
||||
for(let i = 0; i < cached; i++)
|
||||
this.ownCodec(i + 1).then(codec => {
|
||||
console.log(tr("Release again! (%o)"), codec);
|
||||
this.releaseCodec(i + 1);
|
||||
}).catch(error => {
|
||||
/* test if we're able to use this codec */
|
||||
const dummy_client_id = 0xFFEF;
|
||||
|
||||
this.ownCodec(dummy_client_id).then(codec => {
|
||||
console.log(tr("Release again! (%o)"), codec);
|
||||
this.releaseCodec(dummy_client_id);
|
||||
}).catch(error => {
|
||||
if(this._supported) {
|
||||
console.warn(tr("Disabling codec support for "), this.name);
|
||||
if(this._supported) {
|
||||
createErrorModal(tr("Could not load codec driver"), tr("Could not load or initialize codec ") + this.name + "<br>" +
|
||||
"Error: <code>" + JSON.stringify(error) + "</code>").open();
|
||||
}
|
||||
this._supported = false;
|
||||
console.error(error);
|
||||
});
|
||||
createErrorModal(tr("Could not load codec driver"), tr("Could not load or initialize codec ") + this.name + "<br>" +
|
||||
"Error: <code>" + JSON.stringify(error) + "</code>").open();
|
||||
console.error(tr("Failed to initialize the opus codec. Error: %o"), error);
|
||||
} else {
|
||||
console.debug(tr("Failed to initialize already disabled codec. Error: %o"), error);
|
||||
}
|
||||
this._supported = false;
|
||||
});
|
||||
}
|
||||
|
||||
supported() { return this._supported; }
|
||||
|
|
@ -56,7 +60,7 @@ class CodecPool {
|
|||
this.ownCodec(clientId, false).then(resolve).catch(reject);
|
||||
}).catch(error => {
|
||||
console.error(tr("Could not initialize codec!\nError: %o"), error);
|
||||
reject(tr("Could not initialize codec!"));
|
||||
reject(typeof(error) === 'string' ? error : tr("Could not initialize codec!"));
|
||||
});
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,11 @@
|
|||
/// <reference path="CodecWorker.ts" />
|
||||
|
||||
this["Module"] = typeof this["Module"] !== "undefined" ? this["Module"] : {};
|
||||
const WASM_ERROR_MESSAGES = [
|
||||
'no native wasm support detected'
|
||||
];
|
||||
|
||||
this["Module"] = this["Module"] || {};
|
||||
|
||||
let initialized = false;
|
||||
Module['onRuntimeInitialized'] = function() {
|
||||
initialized = true;
|
||||
|
|
@ -12,11 +17,43 @@ Module['onRuntimeInitialized'] = function() {
|
|||
success: true
|
||||
})
|
||||
};
|
||||
Module['onAbort'] = message => {
|
||||
|
||||
let abort_message: string = undefined;
|
||||
let last_error_message: string;
|
||||
|
||||
Module['print'] = function() {
|
||||
if(arguments.length == 1 && arguments[0] == abort_message)
|
||||
return; /* we don't need to reprint the abort message! */
|
||||
console.log(...arguments);
|
||||
};
|
||||
|
||||
Module['printErr'] = function() {
|
||||
if(arguments.length == 1 && arguments[0] == abort_message)
|
||||
return; /* we don't need to reprint the abort message! */
|
||||
|
||||
last_error_message = arguments[0];
|
||||
for(const suppress of WASM_ERROR_MESSAGES)
|
||||
if((arguments[0] as string).indexOf(suppress) != -1)
|
||||
return;
|
||||
|
||||
console.error(...arguments);
|
||||
};
|
||||
|
||||
Module['onAbort'] = (message: string | DOMException) => {
|
||||
/* no native wasm support detected */
|
||||
Module['onAbort'] = undefined;
|
||||
|
||||
if(message instanceof DOMException)
|
||||
message = "DOMException (" + message.name + "): " + message.code + " => " + message.message;
|
||||
else {
|
||||
abort_message = message;
|
||||
if(message.indexOf("no binaryen method succeeded") != -1)
|
||||
for(const error of WASM_ERROR_MESSAGES)
|
||||
if(last_error_message.indexOf(error) != -1) {
|
||||
message = "no native wasm support detected, but its required";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
sendMessage({
|
||||
token: workerCallbackToken,
|
||||
|
|
@ -31,10 +68,11 @@ try {
|
|||
Module['locateFile'] = file => "../../wasm/" + file;
|
||||
importScripts("../../wasm/TeaWeb-Worker-Codec-Opus.js");
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
Module['onAbort']("Cloud not load native script!");
|
||||
if(typeof(Module['onAbort']) === "function") {
|
||||
console.log(e);
|
||||
Module['onAbort']("Failed to load native scripts");
|
||||
} /* else the error had been already handled because its a WASM error */
|
||||
}
|
||||
//let Module = typeof Module !== 'undefined' ? Module : {};
|
||||
|
||||
enum OpusType {
|
||||
VOIP = 2048,
|
||||
|
|
|
|||
2
todo.md
2
todo.md
|
|
@ -1,2 +0,0 @@
|
|||
Add connect profiles for bookmarks, like TeaSpeak-Forum or multiple TeamSpeak Identities
|
||||
Fix server group management dialog for a lots of groups (May even add a search function?)
|
||||
2
vendor/bbcode
vendored
2
vendor/bbcode
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit 0c9d48b2e1d37ddefa6bafb3e2d0c7d04ad4dac6
|
||||
Subproject commit 23f9aca6b6dc1ffccd20d6da04953776a1882f2b
|
||||
6537
vendor/bootstrap-material/bootstrap-material-design.js
vendored
Normal file
6537
vendor/bootstrap-material/bootstrap-material-design.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
1567
vendor/bootstrap/css/bootstrap-grid.css
vendored
1567
vendor/bootstrap/css/bootstrap-grid.css
vendored
File diff suppressed because it is too large
Load diff
7
vendor/bootstrap/css/bootstrap-grid.min.css
vendored
7
vendor/bootstrap/css/bootstrap-grid.min.css
vendored
File diff suppressed because one or more lines are too long
342
vendor/bootstrap/css/bootstrap-reboot.css
vendored
342
vendor/bootstrap/css/bootstrap-reboot.css
vendored
|
|
@ -1,342 +0,0 @@
|
|||
/*!
|
||||
* Bootstrap Reboot v4.0.0-beta.2 (https://getbootstrap.com)
|
||||
* Copyright 2011-2017 The Bootstrap Authors
|
||||
* Copyright 2011-2017 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
|
||||
*/
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
html {
|
||||
font-family: sans-serif;
|
||||
line-height: 1.15;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
-ms-text-size-adjust: 100%;
|
||||
-ms-overflow-style: scrollbar;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
|
||||
@-ms-viewport {
|
||||
width: device-width;
|
||||
}
|
||||
|
||||
article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
|
||||
display: block;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
|
||||
font-size: 1rem;
|
||||
font-weight: 400;
|
||||
line-height: 1.5;
|
||||
color: #212529;
|
||||
text-align: left;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
[tabindex="-1"]:focus {
|
||||
outline: none !important;
|
||||
}
|
||||
|
||||
hr {
|
||||
box-sizing: content-box;
|
||||
height: 0;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
p {
|
||||
margin-top: 0;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
abbr[title],
|
||||
abbr[data-original-title] {
|
||||
text-decoration: underline;
|
||||
-webkit-text-decoration: underline dotted;
|
||||
text-decoration: underline dotted;
|
||||
cursor: help;
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
address {
|
||||
margin-bottom: 1rem;
|
||||
font-style: normal;
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
ol,
|
||||
ul,
|
||||
dl {
|
||||
margin-top: 0;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
ol ol,
|
||||
ul ul,
|
||||
ol ul,
|
||||
ul ol {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
dd {
|
||||
margin-bottom: .5rem;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
blockquote {
|
||||
margin: 0 0 1rem;
|
||||
}
|
||||
|
||||
dfn {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
b,
|
||||
strong {
|
||||
font-weight: bolder;
|
||||
}
|
||||
|
||||
small {
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
sub,
|
||||
sup {
|
||||
position: relative;
|
||||
font-size: 75%;
|
||||
line-height: 0;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
sub {
|
||||
bottom: -.25em;
|
||||
}
|
||||
|
||||
sup {
|
||||
top: -.5em;
|
||||
}
|
||||
|
||||
a {
|
||||
color: #007bff;
|
||||
text-decoration: none;
|
||||
background-color: transparent;
|
||||
-webkit-text-decoration-skip: objects;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color: #0056b3;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a:not([href]):not([tabindex]) {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:not([href]):not([tabindex]):focus {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
pre,
|
||||
code,
|
||||
kbd,
|
||||
samp {
|
||||
font-family: monospace, monospace;
|
||||
font-size: 1em;
|
||||
}
|
||||
|
||||
pre {
|
||||
margin-top: 0;
|
||||
margin-bottom: 1rem;
|
||||
overflow: auto;
|
||||
-ms-overflow-style: scrollbar;
|
||||
}
|
||||
|
||||
figure {
|
||||
margin: 0 0 1rem;
|
||||
}
|
||||
|
||||
img {
|
||||
vertical-align: middle;
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
svg:not(:root) {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
a,
|
||||
area,
|
||||
button,
|
||||
[role="button"],
|
||||
input:not([type="range"]),
|
||||
label,
|
||||
select,
|
||||
summary,
|
||||
textarea {
|
||||
-ms-touch-action: manipulation;
|
||||
touch-action: manipulation;
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
caption {
|
||||
padding-top: 0.75rem;
|
||||
padding-bottom: 0.75rem;
|
||||
color: #868e96;
|
||||
text-align: left;
|
||||
caption-side: bottom;
|
||||
}
|
||||
|
||||
th {
|
||||
text-align: inherit;
|
||||
}
|
||||
|
||||
label {
|
||||
display: inline-block;
|
||||
margin-bottom: .5rem;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
button:focus {
|
||||
outline: 1px dotted;
|
||||
outline: 5px auto -webkit-focus-ring-color;
|
||||
}
|
||||
|
||||
input,
|
||||
button,
|
||||
select,
|
||||
optgroup,
|
||||
textarea {
|
||||
margin: 0;
|
||||
font-family: inherit;
|
||||
font-size: inherit;
|
||||
line-height: inherit;
|
||||
}
|
||||
|
||||
button,
|
||||
input {
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
button,
|
||||
select {
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
button,
|
||||
html [type="button"],
|
||||
[type="reset"],
|
||||
[type="submit"] {
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
button::-moz-focus-inner,
|
||||
[type="button"]::-moz-focus-inner,
|
||||
[type="reset"]::-moz-focus-inner,
|
||||
[type="submit"]::-moz-focus-inner {
|
||||
padding: 0;
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
input[type="radio"],
|
||||
input[type="checkbox"] {
|
||||
box-sizing: border-box;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
input[type="date"],
|
||||
input[type="time"],
|
||||
input[type="datetime-local"],
|
||||
input[type="month"] {
|
||||
-webkit-appearance: listbox;
|
||||
}
|
||||
|
||||
textarea {
|
||||
overflow: auto;
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
fieldset {
|
||||
min-width: 0;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
legend {
|
||||
display: block;
|
||||
width: 100%;
|
||||
max-width: 100%;
|
||||
padding: 0;
|
||||
margin-bottom: .5rem;
|
||||
font-size: 1.5rem;
|
||||
line-height: inherit;
|
||||
color: inherit;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
progress {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
[type="number"]::-webkit-inner-spin-button,
|
||||
[type="number"]::-webkit-outer-spin-button {
|
||||
height: auto;
|
||||
}
|
||||
|
||||
[type="search"] {
|
||||
outline-offset: -2px;
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
[type="search"]::-webkit-search-cancel-button,
|
||||
[type="search"]::-webkit-search-decoration {
|
||||
-webkit-appearance: none;
|
||||
}
|
||||
|
||||
::-webkit-file-upload-button {
|
||||
font: inherit;
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
output {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
summary {
|
||||
display: list-item;
|
||||
}
|
||||
|
||||
template {
|
||||
display: none;
|
||||
}
|
||||
|
||||
[hidden] {
|
||||
display: none !important;
|
||||
}
|
||||
/*# sourceMappingURL=bootstrap-reboot.css.map */
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
/*!
|
||||
* Bootstrap Reboot v4.0.0-beta.2 (https://getbootstrap.com)
|
||||
* Copyright 2011-2017 The Bootstrap Authors
|
||||
* Copyright 2011-2017 Twitter, Inc.
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
||||
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
|
||||
*/*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}[tabindex="-1"]:focus{outline:0!important}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}dfn{font-style:italic}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent;-webkit-text-decoration-skip:objects}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([tabindex]){color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus,a:not([href]):not([tabindex]):hover{color:inherit;text-decoration:none}a:not([href]):not([tabindex]):focus{outline:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg:not(:root){overflow:hidden}[role=button],a,area,button,input:not([type=range]),label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#868e96;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=date],input[type=datetime-local],input[type=month],input[type=time]{-webkit-appearance:listbox}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item}template{display:none}[hidden]{display:none!important}
|
||||
/*# sourceMappingURL=bootstrap-reboot.min.css.map */
|
||||
8374
vendor/bootstrap/css/bootstrap.css
vendored
8374
vendor/bootstrap/css/bootstrap.css
vendored
File diff suppressed because it is too large
Load diff
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue