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

Fixed rename errors

canary
WolverinDEV 2019-03-28 17:38:41 +01:00
parent 077f5a66ae
commit 2dbbd32d9f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/js/main.ts
View File

@ -288,7 +288,7 @@ function main() {
Modals.spawnAvatarList(globalClient);
}, 1000);
*/
window.test_upload = () => {
(<any>window).test_upload = () => {
const data = "Hello World";
globalClient.fileManager.upload_file({
size: data.length,

6
shared/js/permission/PermissionManager.ts
View File

@ -696,7 +696,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
let client = parseInt(json[0]["cldbid"]);
let permissions = PermissionManager.parse_permission_bulk(json, this);
for(let req of this.requests_client_permissions.slice(0)) {
if(req.client_avatar_id == client) {
if(req.client_id == client) {
this.requests_client_permissions.remove(req);
req.promise.resolved(permissions);
}
@ -705,7 +705,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
requestClientPermissions(client_id: number) : Promise<PermissionValue[]> {
for(let request of this.requests_client_permissions)
if(request.client_avatar_id == client_id && request.promise.time() + 1000 > Date.now())
if(request.client_id == client_id && request.promise.time() + 1000 > Date.now())
return request.promise;
let request: TeaPermissionRequest = {} as any;
@ -725,7 +725,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
requestClientChannelPermissions(client_id: number, channel_id: number) : Promise<PermissionValue[]> {
for(let request of this.requests_client_channel_permissions)
if(request.client_avatar_id == client_id && request.channel_id == channel_id && request.promise.time() + 1000 > Date.now())
if(request.client_id == client_id && request.channel_id == channel_id && request.promise.time() + 1000 > Date.now())
return request.promise;
let request: TeaPermissionRequest = {} as any;

6
shared/js/ui/htmltags.ts
View File

@ -30,8 +30,8 @@ namespace htmltags {
/* build the opening tag: <div ...> */
result = result + "<div class='htmltag-client' ";
if(properties.client_avatar_id)
result = result + "client-id='" + properties.client_avatar_id + "' ";
if(properties.client_id)
result = result + "client-id='" + properties.client_id + "' ";
if(properties.client_unique_id && properties.client_unique_id != "unknown")
result = result + "client-unique-id='" + encodeURIComponent(properties.client_unique_id) + "' ";
@ -177,7 +177,7 @@ namespace htmltags {
return generate_client_open({
add_braces: false,
client_avatar_id: parseInt(groups[1]),
client_id: parseInt(groups[1]),
client_unique_id: groups[2],
client_name: decodeURIComponent(groups[3])
});